--- archive.module.orig	2005-05-03 05:43:45.000000000 +0900
+++ archive.module	2005-05-03 05:43:22.000000000 +0900
@@ -24,8 +24,8 @@
   $edit = $_POST['edit'];
 
   // Extract today's date:
-  $start_of_today = mktime(0, 0, 0, date('n', time()), date('d', time()), date('Y', time())) + $user->timezone;
-  $end_of_today = mktime(23, 59, 59, date('n', time()), date('d', time()), date('Y', time())) + $user->timezone;
+  $start_of_today = mktime(0, 0, 0, date('n', time()), date('d', time()), date('Y', time()));
+  $end_of_today = mktime(23, 59, 59, date('n', time()), date('d', time()), date('Y', time()));
 
   // Extract the requested date:
   if ($edit['year'] && $edit['month'] && $edit['day']) {
@@ -33,21 +33,21 @@
     $month = $edit['month'];
     $day = $edit['day'];
 
-    $requested = mktime(0, 0, 0, $month, $day, $year) + $user->timezone;
+    $requested = mktime(0, 0, 0, $month, $day, $year);
   }
   else if (arg(0) == 'archive' && arg(3)) {
     $year = arg(1);
     $month = arg(2);
     $day = arg(3);
 
-    $requested = mktime(0, 0, 0, $month, $day, $year) + $user->timezone;
+    $requested = mktime(0, 0, 0, $month, $day, $year);
   }
   else {
     $year = date('Y', time());
     $month  = date('n', time());
     $day = date('d', time());
 
-    $requested = $end_of_today + $user->timezone;
+    $requested = $end_of_today;
   }
 
   $start_of_month = mktime(0, 0, 0, $month, 1, $year);
@@ -76,7 +76,7 @@
 
   $days_with_posts = array();
   while ($day_with_post = db_fetch_object($result)) {
-    $days_with_posts[] = date('j', $day_with_post->created + $user->timezone);
+    $days_with_posts[] = date('j', $day_with_post->created);
   }
   $days_with_posts = array_unique($days_with_posts);
 
@@ -124,7 +124,7 @@
     }
 
     // Print one cell:
-    $date = mktime(0, 0, 0, $month, $nday, $year) + $user->timezone;
+    $date = mktime(0, 0, 0, $month, $nday, $year);
     if (in_array($nday, $days_with_posts)) {
       $daytext = l($nday, "archive/$year/$month/$nday");
       $dayclass = 'day-link';
@@ -231,8 +231,8 @@
     $day = $edit['day'];
   }
 
-  $date = mktime(0, 0, 0, $month, $day, $year) - $user->timezone;
-  $date_end = mktime(0, 0, 0, $month, $day + 1, $year) - $user->timezone;
+  $date = mktime(0, 0, 0, $month, $day, $year);
+  $date_end = mktime(0, 0, 0, $month, $day + 1, $year);
 
   // Prepare the values of the form fields.
   $years = drupal_map_assoc(range(2000, 2005));