Cleanup from previous commit.

Refs #GH-1352
cakephp · Jun 19, 2013 · 68db74d · 68db74d
1 parent dc3f911
commit 68db74d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -6630,27 +6630,26 @@ public function testYearAutoExpandRange() {
 
 /**
  * testInputDateMaxYear method
- * 
- * Let's say we want to only allow users born from
- * 2006 to 2008 to register
- * This beeing the first singup page, we still don't have any data
+ *
+ * Let's say we want to only allow users born from 2006 to 2008 to register
+ * This being the first singup page, we still don't have any data
  *
  * @return void
  */
 	public function testInputDateMaxYear() {
-				$this->Form->request->data = array();
-				$this->Form->create('User');
-				$result = $this->Form->input('birthday',
-						array(
-							'label' => false,
-							'div' => false,
-							'type' => 'date',
-							'dateFormat' => 'DMY',
-							'minYear' => 2006,
-							'maxYear' => 2008
-						)
-				);
-				$this->assertContains('value="2008" selected="selected"', $result);
+		$this->Form->request->data = array();
+		$this->Form->create('User');
+		$result = $this->Form->input('birthday',
+				array(
+					'label' => false,
+					'div' => false,
+					'type' => 'date',
+					'dateFormat' => 'DMY',
+					'minYear' => 2006,
+					'maxYear' => 2008
+				)
+		);
+		$this->assertContains('value="2008" selected="selected"', $result);
 	}
 
 /**

diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php
@@ -2359,10 +2359,9 @@ public function dateTime($fieldName, $dateFormat = 'DMY', $timeFormat = '12', $a
 		}
 
 		if ($attributes['value'] === null && $attributes['empty'] != true) {
-			if(!empty($attributes['maxYear']) && $attributes['maxYear'] < date('Y')) {
+			$attributes['value'] = time();
+			if (!empty($attributes['maxYear']) && $attributes['maxYear'] < date('Y')) {
 				$attributes['value'] = strtotime(date($attributes['maxYear'] . '-m-d'));
-			} else {
-				$attributes['value'] = time();
 			}
 		}