Merge remote-tracking branch 'extensibility/MAGETWO-35338-use-all-lis…

…t' into PR_Branch
magento · Mar 20, 2015 · 992d8ae · 992d8ae
2 parents a70745a + 5a6a4e7
commit 992d8ae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php b/app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php
@@ -19,7 +19,7 @@ class Timezone extends \Magento\Framework\App\Config\Value
      */
     public function beforeSave()
     {
-        if (!in_array($this->getValue(), \DateTimeZone::listIdentifiers(\DateTimeZone::ALL_WITH_BC))) {
+        if (!in_array($this->getValue(), \DateTimeZone::listIdentifiers(\DateTimeZone::ALL))) {
             throw new LocalizedException(__('Please correct the timezone.'));
         }
         return $this;

diff --git a/lib/internal/Magento/Framework/Locale/Lists.php b/lib/internal/Magento/Framework/Locale/Lists.php
@@ -103,7 +103,7 @@ public function getOptionTimezones()
     {
         $options = [];
         $locale = $this->localeResolver->getLocale();
-        $zones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL_WITH_BC);
+        $zones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL);
         foreach ($zones as $code) {
             $options[] = [
                 'label' => \IntlTimeZone::createTimeZone($code)->getDisplayName(

diff --git a/setup/src/Magento/Setup/Model/Lists.php b/setup/src/Magento/Setup/Model/Lists.php
@@ -36,7 +36,7 @@ public function __construct(ConfigInterface $localeConfig)
      */
     public function getTimezoneList()
     {
-        $zones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL_WITH_BC);
+        $zones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL);
         $list = [];
         foreach ($zones as $code) {
             $list[$code] = \IntlTimeZone::createTimeZone($code)->getDisplayName(