WP Merge to #4124

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@734 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 18 deletions

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 68e9427..de40712 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -320,22 +320,6 @@ function gzip_compression() {
 	}
 }
 
-
-// functions to count the page generation time (from phpBB2)
-// ( or just any time between timer_start() and timer_stop() )
-
-function timer_stop($display = 0, $precision = 3) { //if called like timer_stop(1), will echo $timetotal
-	global $timestart, $timeend;
-	$mtime = microtime();
-	$mtime = explode(' ',$mtime);
-	$mtime = $mtime[1] + $mtime[0];
-	$timeend = $mtime;
-	$timetotal = $timeend-$timestart;
-	if ( $display )
-		echo number_format($timetotal,$precision);
-	return $timetotal;
-}
-
 function make_url_footnote($content) {
 	preg_match_all('/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches);
 	$j = 0;
@@ -979,7 +963,7 @@ function wp_upload_bits($name, $type, $bits) {
 
 	$ifp = @ fopen($new_file, 'wb');
 	if ( ! $ifp )
-		return array('error' => "Could not write file $new_file.");
+		return array('error' => sprintf(__('Could not write file %s'), $new_file));
 
 	$success = @ fwrite($ifp, $bits);
 	fclose($ifp);
@@ -1123,7 +1107,7 @@ function wp_explain_nonce($action) {
 		}
 	}
 
-	return __('Are you sure you want to do this');
+	return __('Are you sure you want to do this?');
 }
 
 function wp_nonce_ays($action) {