--- I:\drupal-4.6.2\modules\flexinode\field_timestamp.inc.orig	Thu Sep 16 16:34:00 2004
+++ I:\drupal-4.6.2\modules\flexinode\field_timestamp.inc	Mon Jul 25 15:43:59 2005
@@ -104,12 +104,21 @@
         $hour -= 12;
       }
     }
-    $result = gmmktime($hour, $node->{$prefix . 'minute'}, 0, $node->{$prefix . 'month'}, $node->{$prefix . 'day'}, $node->{$prefix . 'year'}) - $GLOBALS['user']->timezone;
+
+    $offset = 0;
+    if (variable_get('configurable_timezones', 1)) {
+        global $user;
+        $offset = $user->timezone;
+    }
+    else {
+        $offset = variable_get('date_default_timezone', 0);
+    }
+
+    $result = gmmktime($hour, $node->{$prefix . 'minute'}, 0, $node->{$prefix . 'month'}, $node->{$prefix . 'day'}, $node->{$prefix . 'year'}) - $offset;
   }
   else if (isset($node->$prefix)) {
     $result = $node->$prefix;
   }
-
   return $result;
 }