From 381e0879d058808fcbeb17dfe1b96f28e6b0587e Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 10 Apr 2005 20:07:46 +0000
Subject: [PATCH] Weekly archives fixes. 
 http://mosquito.wordpress.org/view.php?id=1217

git-svn-id: http://svn.automattic.com/wordpress/trunk@2526 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options.php      |  2 --
 wp-includes/functions.php | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/wp-admin/options.php b/wp-admin/options.php
index 6a17d9adb..e48d14282 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -53,8 +53,6 @@ case 'update':
             if ($user_level >= $option->option_admin_level) {
                 $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';
                 if ($new_val !== $old_val) {
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 016e26623..a918f903c 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -84,13 +84,21 @@ function get_weekstartend($mysqlstring, $start_of_week) {
 	$day = mktime(0,0,0, $md, $mm, $my);
 	$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;
 }