Changeset 1001

Timestamp:

03/25/2004 02:21:40 AM (21 years ago)

Author:

michelvaldrighi

Message:

since time_difference is now relative to GMT, we should use gmdate instead of date when adding time_difference

File:

• trunk/wp-includes/functions.php (modified) (4 diffs)

trunk/wp-includes/functions.php

@@ -50 +50 @@
 }
 
-function current_time($type) {
+function current_time($type, $gmt = 0) {
     $time_difference = get_settings('time_difference');
     switch ($type) {
         case 'mysql':
-            return gmdate('Y-m-d H:i:s');
+            return ($gmt) ? gmdate('Y-m-d H:i:s')
+                : gmdate('Y-m-d H:i:s', (time() + ($time_difference * 3600)));;
             break;
         case 'timestamp':
-            return time();
+            return ($gmt) ? time()
+                : time() + ($time_difference * 3600);
             break;
     }
@@ -458 +460 @@
     
     $time_adj = time() + ($time_difference * 3600);
-    $post_date_localtime = get_date_from_gmt($postdata['Date']);
-    $jj = ($edit) ? mysql2date('d', $post_date_localtime) : date('d', $time_adj);
-    $mm = ($edit) ? mysql2date('m', $post_date_localtime) : date('m', $time_adj);
-    $aa = ($edit) ? mysql2date('Y', $post_date_localtime) : date('Y', $time_adj);
-    $hh = ($edit) ? mysql2date('H', $post_date_localtime) : date('H', $time_adj);
-    $mn = ($edit) ? mysql2date('i', $post_date_localtime) : date('i', $time_adj);
-    $ss = ($edit) ? mysql2date('s', $post_date_localtime) : date('s', $time_adj);
+    $post_date = $postdata['Date'];
+    $jj = ($edit) ? mysql2date('d', $post_date) : gmdate('d', $time_adj);
+    $mm = ($edit) ? mysql2date('m', $post_date) : gmdate('m', $time_adj);
+    $aa = ($edit) ? mysql2date('Y', $post_date) : gmdate('Y', $time_adj);
+    $hh = ($edit) ? mysql2date('H', $post_date) : gmdate('H', $time_adj);
+    $mn = ($edit) ? mysql2date('i', $post_date) : gmdate('i', $time_adj);
+    $ss = ($edit) ? mysql2date('s', $post_date) : gmdate('s', $time_adj);
 
     echo '<input type="text" name="jj" value="'.$jj.'" size="2" maxlength="2" />'."\n";
@@ -1199 +1201 @@
     }
     $authordata = get_userdata($post->post_author);
-    $post->post_date_local = get_date_from_gmt($post->post_date);
-#   $post->post_date = get_date_from_gmt($post->post_date);
-    $day = mysql2date('d.m.y', $post->post_date_local);
-    $currentmonth = mysql2date('m', $post->post_date_local);
+    $day = mysql2date('d.m.y', $post->post_date);
+    $currentmonth = mysql2date('m', $post->post_date);
     $numpages = 1;
     if (!$page)
@@ -1558 +1558 @@
     if (!isset($r['order'])) $r['order'] = '';
 
-    $now = gmdate('Y-m-d H:i:s');
+    $now = current_time('mysql');
 
     $posts = $wpdb->get_results("SELECT DISTINCT * FROM $tableposts WHERE post_date <= '$now' AND (post_status = 'publish') GROUP BY $tableposts.ID ORDER BY post_date DESC LIMIT " . $r['offset'] . ',' . $r['numberposts']);