Index: field_timestamp.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flexinode/field_timestamp.inc,v
retrieving revision 1.9
diff -u -r1.9 field_timestamp.inc
--- field_timestamp.inc	16 Sep 2004 14:34:00 -0000	1.9
+++ field_timestamp.inc	27 Oct 2004 06:55:19 -0000
@@ -104,7 +104,13 @@
         $hour -= 12;
       }
     }
-    $result = gmmktime($hour, $node->{$prefix . 'minute'}, 0, $node->{$prefix . 'month'}, $node->{$prefix . 'day'}, $node->{$prefix . 'year'}) - $GLOBALS['user']->timezone;
+    $result = gmmktime($hour, $node->{$prefix . 'minute'}, 0, $node->{$prefix . 'month'}, $node->{$prefix . 'day'}, $node->{$prefix . 'year'});
+    if (variable_get('configurable_timezones', 1) && strlen($GLOBALS['user']->timezone)) {
+      $result -= $GLOBALS['user']->timezone;
+    }
+    else {
+      $result -= variable_get('date_default_timezone', 0);
+    }
   }
   else if (isset($node->$prefix)) {
     $result = $node->$prefix;