Fixed calculating number of weeks in year accordingly ISO 8601

Author: wizardjedi

core/Base/Date.class.php

@@ -118,7 +118,13 @@ public static function compare(Date $left, Date $right)
 
 		public static function getWeekCountInYear($year)
 		{
-			return date('W', mktime(0, 0, 0, 12, 31, $year));
+			$weekCount = date('W', mktime(0, 0, 0, 12, 31, $year));
+			
+			if ($weekCount == '01') {
+				return date('W', mktime(0, 0, 0, 12, 24, $year));
+			} else {
+				return $weekCount;
+			}
 		}
 
 		public function __construct($date)

test/core/DateTest.class.php

@@ -43,6 +43,13 @@ public function testDayDifference()
 			$right = Timestamp::create('2008-03-30 03:00:00');
 
 			$this->dayDifferenceTest($left, $right, 1);
+
+			$weekCount = Date::getWeekCountInYear(2012);
+			$this->assertEquals($weekCount, 52, "Week count is incorrect");
+
+			$dateFromWeekNumberStamp = Date::makeFromWeek(5, 2012)->toStamp();
+			$expectedDate = Date::create('2012-01-30 00:00:00')->toStamp();
+			$this->assertEquals($dateFromWeekNumberStamp, $expectedDate, 'Creating date from week number is incorrect.');
 
 			// unsolved giv's case
 			// $left = Timestamp::create('2008-10-25 03:00:00');