Ticket #9588: 9588.4.diff

wp-admin/includes/upgrade.php

@@ -447 +447 @@
 
         $time_difference = $all_options->time_difference;
 
-        $server_time = time()+date('Z');
+        $server_time = strtotime(gmdate("Y-m-d H:i:s"))+date('Z');
         $weblogger_time = $server_time + $time_difference*3600;
-        $gmt_time = time();
+        $gmt_time = strtotime(gmdate("Y-m-d H:i:s"));
 
         $diff_gmt_server = ($gmt_time - $server_time) / 3600;
         $diff_weblogger_server = ($weblogger_time - $server_time) / 3600;