Fixed bug with years and month selector in wages

lillem4n · lillem4n · commit 5d47b62eb3d8 · 2012-01-11T10:44:28.000+01:00
diff --git a/classes/controller/admin/wages.php b/classes/controller/admin/wages.php
@@ -23,8 +23,11 @@ public function action_index()
 			}
 
 			$periods = array();
-			while ($year <= $current_year && $month <= $current_month)
+			while (1 == 1)
 			{
+				if ($year > $current_year) break;
+				elseif ($year == $current_year && $month > $current_month) break;
+
 				$periods[$year.$month.'option'] = array(
 					'@value' => $year.'-'.$month,
 					$year.' '.date('F', mktime(0,0,0,$month,1))
@@ -37,6 +40,7 @@ public function action_index()
 					$month = 1;
 				}
 			}
+
 			xml::to_XML($periods, $this->xml_content->appendChild($this->dom->createElement('periods')));
 
 			if ( ! isset($_GET['period']) || ! preg_match('/^\d{4}-\d{1,2}$/', $_GET['period']))

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,11 @@ public function action_index()`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`$periods = array();`
`26`		`- while ($year <= $current_year && $month <= $current_month)`
	`26`	`+ while (1 == 1)`
`27`	`27`	`{`
	`28`	`+ if ($year > $current_year) break;`
	`29`	`+ elseif ($year == $current_year && $month > $current_month) break;`
	`30`	`+`
`28`	`31`	`$periods[$year.$month.'option'] = array(`
`29`	`32`	`'@value' => $year.'-'.$month,`
`30`	`33`	`$year.' '.date('F', mktime(0,0,0,$month,1))`
`@@ -37,6 +40,7 @@ public function action_index()`
`37`	`40`	`$month = 1;`
`38`	`41`	`}`
`39`	`42`	`}`
	`43`	`+`
`40`	`44`	`xml::to_XML($periods, $this->xml_content->appendChild($this->dom->createElement('periods')));`
`41`	`45`
`42`	`46`	`if ( ! isset($_GET['period']) \|\| ! preg_match('/^\d{4}-\d{1,2}$/', $_GET['period']))`