Changeset 3279

Timestamp:

08/06/2008 09:41:49 AM (4 months ago)

Author:

Shadowhand

Message:

Finally fixed #632, thanks dyron!

Files:

• trunk/system/libraries/Calendar.php (modified) (3 diffs)

trunk/system/libraries/Calendar.php

@@ -221 +221 @@
                 $month = $week = array();
 
-                // Number of days added. When this reaches 7, start a new month
+                // Number of days added. When this reaches 7, start a new week
                 $days = 0;
                 $week_number = 1;
 
-                if (($w = (int) date('w', $first)) > $this->week_start)
+                if (($w = (int) date('w', $first) - $this->week_start) < 0)
+                {
+                        $w = 6;
+                }
+
+                if ($w > 0)
                 {
                         // Number of days in the previous month
@@ -231 +236 @@
 
                         // i = number of day, t = number of days to pad
-                        for ($i = $n - $w + $this->week_start + 1, $t = $w - $this->week_start; $t > 0; $t--, $i++)
+                        for ($i = $n - $w + 1, $t = $w; $t > 0; $t--, $i++)
                         {
                                 // Notify the listeners
@@ -262 +267 @@
                 }
 
-                if (($w = (int) date('w', $last) - $this->week_start) < 6 AND $w > -1)
+                if (($w = (int) date('w', $last) - $this->week_start) < 0)
+                {
+                        $w = 6;
+                }
+
+                if ($w >= 0)
                 {
                         // i = number of day, t = number of days to pad