Changeset 2526

Timestamp:

04/10/2005 08:07:46 PM (19 years ago)

Author:

ryan

Message:

Weekly archives fixes. ​http://mosquito.wordpress.org/view.php?id=1217

Location:

trunk

Files:

• wp-admin/options.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/options.php

@@ -54 +54 @@
                 $old_val = $option->option_value;
                 $new_val = trim($_POST[$option->option_name]);
-                if ( !$new_val && $old_val != 0 )
-                    $new_val = '';
                 if( in_array($option->option_name, $nonbools) && ( $new_val == '0' || $new_val == '') )
                     $new_val = 'closed';

trunk/wp-includes/functions.php

@@ -85 +85 @@
     $weekday = date('w',$day);
     $i = 86400;
+
+    if ($weekday < get_settings('start_of_week'))
+        $weekday = 7 - (get_settings('start_of_week') - $weekday);
+
     while ($weekday > get_settings('start_of_week')) {
         $weekday = date('w',$day);
+        if ($weekday < get_settings('start_of_week'))
+            $weekday = 7 - (get_settings('start_of_week') - $weekday);
+
         $day = $day - 86400;
         $i = 0;
     }
     $week['start'] = $day + 86400 - $i;
-    $week['end']   = $day + 691199;
+    //$week['end']   = $day - $i + 691199;
+    $week['end'] = $week['start'] + 604799;
     return $week;
 }