--- date_api.module	2010-12-14 11:37:13.000000000 -0500
+++ date_api.module.fixed	2010-12-14 11:41:21.000000000 -0500
@@ -1732,7 +1732,22 @@ function date_get_timezone($handling, $t
  *  Function to figure out which db timezone applies to a date and select it
  */
 function date_get_timezone_db($handling, $timezone = '') {
-  return 'UTC';
+  switch ($handling) {
+    case ('none'):
+    case ('utc'):
+      $timezone = 'UTC';
+      break;
+    case ('date'):
+    case ('site'):
+      $timezone = date_default_timezone(FALSE);
+      break;
+    case ('user'):
+      $timezone = date_default_timezone();
+      break;
+    default:
+      $timezone = 'UTC';
+  }
+  return $timezone > '' ? $timezone : date_default_timezone();
 }
 
 /**