Ticket #991: 991branches20.diff

wp-includes/functions.php

@@ -844 +844 @@
         $mtime = $mtime[1] + $mtime[0];
         $timeend = $mtime;
         $timetotal = $timeend-$timestart;
+        $r = number_format($timetotal, $precision);
         if ( $display )
-                echo number_format($timetotal,$precision);
-        return $timetotal;
+                echo $r;
+        return $r;
 }
 
 function weblog_ping($server = '', $path = '') {
@@ -2508 +2509 @@
         die();
 }
 
-?>
- No newline at end of file
+?>

wp-admin/admin-footer.php

@@ -2 +2 @@
 <div id="footer"><p><a href="http://wordpress.org/" id="wordpress-logo"><img src="images/wordpress-logo.png" alt="WordPress" /></a></p>
 <p>
 <a href="http://codex.wordpress.org/"><?php _e('Documentation'); ?></a> &#8212; <a href="http://wordpress.org/support/"><?php _e('Support Forums'); ?></a> <br />
-<?php bloginfo('version'); ?> &#8212; <?php printf(__('%s seconds'), number_format(timer_stop(), 2)); ?>
+<?php bloginfo('version'); ?> &#8212; <?php printf(__('%s seconds'), timer_stop(0, 2)); ?>
 </p>
 
 </div>