Преглед на файлове

Merge remote branch 'jwage/master'

* jwage/master:
  Revert back to using gmmktime and use day 15 instead of 1 to avoid edge case
  Use mktime instead of gmmaketime. On the 1st of every month the following options are generated:
Fabien Potencier преди 14 години
родител
ревизия
dd5f088abb
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php

@@ -46,7 +46,7 @@ class MonthChoiceList extends PaddedChoiceList
 
             foreach ($this->choices as $choice => $value) {
                 // It's important to specify the first day of the month here!
-                $this->choices[$choice] = $this->formatter->format(gmmktime(0, 0, 0, $value, 1));
+                $this->choices[$choice] = $this->formatter->format(gmmktime(0, 0, 0, $value, 15));
             }
 
             // I'd like to clone the formatter above, but then we get a