Skip to content

Commit ea115ca

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-59365' into BUGS
2 parents a821c01 + 7308595 commit ea115ca

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public function toOptionArray()
253253
if (count($options) > 0) {
254254
array_unshift(
255255
$options,
256-
['title' => null, 'value' => null, 'label' => __('Please select a region, state or province.')]
256+
['title' => '', 'value' => '', 'label' => __('Please select a region, state or province.')]
257257
);
258258
}
259259
return $options;

app/code/Magento/Ui/view/base/web/js/form/element/country.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ define([
4242
});
4343

4444
this.setOptions(result);
45+
this.reset();
4546
}
4647
});
4748
});

0 commit comments

Comments
 (0)