Changeset 6995

Timestamp:

02/23/2008 10:11:47 PM (18 years ago)

Author:

westi

Message:

Fix the display of human time difference when server timezone if different from blog timezone. Fixes #5970 props jhodgdon.

Location:

trunk

Files:

• wp-admin/edit-attachment-rows.php (modified) (1 diff)
• wp-admin/edit-post-rows.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/edit-attachment-rows.php

@@ -66 +66 @@
                         $t_time = get_the_time(__('Y/m/d g:i:s A'));
                         $m_time = $post->post_date;
-                        $time = get_post_time();
+                        $time = get_post_time( 'G', true );
                         if ( ( abs($t_diff = time() - $time) ) < 86400 ) {
                                 if ( $t_diff < 0 )

trunk/wp-admin/edit-post-rows.php

@@ -45 +45 @@
                                 $t_time = get_the_modified_time(__('Y/m/d g:i:s A'));
                                 $m_time = $post->post_modified;
-                                $time = get_post_modified_time();
+                                $time = get_post_modified_time('G', true);
                         } else {
                                 $t_time = get_the_time(__('Y/m/d g:i:s A'));
                                 $m_time = $post->post_date;
-                                $time = get_post_time();
+                                $time = get_post_time('G', true);
                         }
                         if ( ( abs(time() - $time) ) < 86400 ) {

trunk/wp-admin/includes/template.php

@@ -380 +380 @@
                                 $t_time = get_the_modified_time(__('Y/m/d g:i:s A'));
                                 $m_time = $page->post_modified;
-                                $time = get_post_modified_time();
+                                $time = get_post_modified_time('G', true);
                         } else {
                                 $t_time = get_the_time(__('Y/m/d g:i:s A'));
                                 $m_time = $page->post_date;
-                                $time = get_post_time();
+                                $time = get_post_time('G', true);
                         }
                         if ( ( abs(time() - $time) ) < 86400 ) {

trunk/wp-includes/functions.php

@@ -6 +6 @@
         if ( empty( $m ) )
                 return false;
+                
+        if( 'G' == $dateformatstring ) {
+                return gmmktime(
+                        (int) substr( $m, 11, 2 ), (int) substr( $m, 14, 2 ), (int) substr( $m, 17, 2 ),
+                        (int) substr( $m, 5, 2 ), (int) substr( $m, 8, 2 ), (int) substr( $m, 0, 4 )
+                );
+        }
+        
         $i = mktime(
                 (int) substr( $m, 11, 2 ), (int) substr( $m, 14, 2 ), (int) substr( $m, 17, 2 ),