Fix for HTML attributes being ignored for individual datetime selects.

Closes #5829
cakephp · Feb 8, 2015 · 40a6634 · 40a6634
1 parent ed5b3de
commit 40a6634
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
@@ -1884,7 +1884,12 @@ protected function _singleDatetime($options, $keep)
             $off,
             array_fill(0, count($off), false)
         );
-        $options = $off + $options;
+
+        $attributes = array_diff_key(
+            $options,
+            ['value' => null, 'empty' => null]
+        );
+        $options = $options + $off + [$keep => $attributes];
 
         if (isset($options['value'])) {
             $options['val'] = $options['value'];

diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php
@@ -5194,9 +5194,9 @@ public function testDay()
     {
         extract($this->dateRegex);
 
-        $result = $this->Form->day('Model.field', ['value' => '']);
+        $result = $this->Form->day('Model.field', ['value' => '', 'class' => 'form-control']);
         $expected = [
-            ['select' => ['name' => 'Model[field][day]']],
+            ['select' => ['name' => 'Model[field][day]', 'class' => 'form-control']],
             ['option' => ['selected' => 'selected', 'value' => '']],
             '/option',
             ['option' => ['value' => '01']],