Ticket #8662: wp_current_time.diff

branches/2.7/wp-includes/functions.php

@@ -94 +94 @@
                         return ( $gmt ) ? gmdate( 'Y-m-d H:i:s' ) : gmdate( 'Y-m-d H:i:s', ( time() + ( get_option( 'gmt_offset' ) * 3600 ) ) );
                         break;
                 case 'timestamp':
-                        return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * 3600 );
+                        return ( $gmt ) ? strtotime(gmdate("Y-m-d H:i:s")) : strtotime(gmdate("Y-m-d H:i:s")) + ( get_option( 'gmt_offset' ) * 3600 );
                         break;
         }
 }

trunk/wp-includes/functions.php

@@ -94 +94 @@
                         return ( $gmt ) ? gmdate( 'Y-m-d H:i:s' ) : gmdate( 'Y-m-d H:i:s', ( time() + ( get_option( 'gmt_offset' ) * 3600 ) ) );
                         break;
                 case 'timestamp':
-                        return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * 3600 );
+                        return ( $gmt ) ? strtotime(gmdate("Y-m-d H:i:s")) : strtotime(gmdate("Y-m-d H:i:s")) + ( get_option( 'gmt_offset' ) * 3600 );
                         break;
         }
 }