adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix infinite loop when minYear/maxYear are not int.

Browse source 
Refs #2361
This commit is contained in:
mark_story 2011-12-11 22:03:39 -05:00
parent 205bfb506f
commit 8bb6f8803c
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
View file

@ -5624,6 +5624,9 @@ class FormHelperTest extends CakeTestCase {
'/select', '/select',
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);
$result = $this->Form->year('published', array(), array(), array('empty' => false));
$this->assertContains('data[Contact][published][year]', $result);
} }
/** /**

12
lib/Cake/View/Helper/FormHelper.php
View file

@ -2461,17 +2461,9 @@ class FormHelper extends AppHelper {
case 'year': case 'year':
$current = intval(date('Y')); $current = intval(date('Y'));
if (!isset($options['min'])) { $min = !isset($options['min']) ? $current - 20 : (int)$options['min'];
$min = $current - 20; $max = !isset($options['max']) ? $current + 20 : (int)$options['max'];
} else {
$min = $options['min'];
}
if (!isset($options['max'])) {
$max = $current + 20;
} else {
$max = $options['max'];
}
if ($min > $max) { if ($min > $max) {
list($min, $max) = array($max, $min); list($min, $max) = array($max, $min);
} }