X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Ffilerepo%2Ffile%2FFile.php;h=f40d216c58da556d4a1a89c705764d405bef02e7;hb=b60dded47b7c4437a21baea8ee0780243340abb6;hp=72b3ae9d8142c49295cb702d36c294cd1f68d68e;hpb=ca56f1fbc32529622cf430fe2ed44347b85e3c24;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 72b3ae9d81..f40d216c58 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -213,14 +213,15 @@ abstract class File implements IDBAccessObject {
 	}
 
 	/**
-	 * Normalize a file extension to the common form, and ensure it's clean.
-	 * Extensions with non-alphanumeric characters will be discarded.
+	 * Normalize a file extension to the common form, making it lowercase and checking some synonyms,
+	 * and ensure it's clean. Extensions with non-alphanumeric characters will be discarded.
+	 * Keep in sync with mw.Title.normalizeExtension() in JS.
 	 *
-	 * @param string $ext (without the .)
-	 * @return string
+	 * @param string $extension File extension (without the leading dot)
+	 * @return string File extension in canonical form
 	 */
-	static function normalizeExtension( $ext ) {
-		$lower = strtolower( $ext );
+	static function normalizeExtension( $extension ) {
+		$lower = strtolower( $extension );
 		$squish = array(
 			'htm' => 'html',
 			'jpeg' => 'jpg',
@@ -423,7 +424,10 @@ abstract class File implements IDBAccessObject {
 		if ( !isset( $this->fsFile ) ) {
 			$starttime = microtime( true );
 			$this->fsFile = $this->repo->getLocalReference( $this->getPath() );
-			RequestContext::getMain()->getStats()->timing( 'media.thumbnail.generate.fetchoriginal', microtime( true ) - $starttime );
+
+			$statTiming = microtime( true ) - $starttime;
+			RequestContext::getMain()->getStats()->timing(
+				'media.thumbnail.generate.fetchoriginal', 1000 * $statTiming );
 
 			if ( !$this->fsFile ) {
 				$this->fsFile = false; // null => false; cache negative hits
@@ -1120,7 +1124,8 @@ abstract class File implements IDBAccessObject {
 		$thumb = $handler->doTransform( $this, $tmpThumbPath, $thumbUrl, $transformParams );
 		$tmpFile->bind( $thumb ); // keep alive with $thumb
 
-		$stats->timing( 'media.thumbnail.generate.transform', microtime( true ) - $starttime );
+		$statTiming = microtime( true ) - $starttime;
+		$stats->timing( 'media.thumbnail.generate.transform', 1000 * $statTiming );
 
 		if ( !$thumb ) { // bad params?
 			$thumb = false;
@@ -1143,14 +1148,13 @@ abstract class File implements IDBAccessObject {
 				$thumb = $this->transformErrorOutput( $thumbPath, $thumbUrl, $transformParams, $flags );
 			}
 
-			$stats->timing( 'media.thumbnail.generate.store', microtime( true ) - $starttime );
+			$statTiming = microtime( true ) - $starttime;
+			$stats->timing( 'media.thumbnail.generate.store', 1000 * $statTiming );
 
 			// Give extensions a chance to do something with this thumbnail...
 			Hooks::run( 'FileTransformed', array( $this, $thumb, $tmpThumbPath, $thumbPath ) );
 		}
 
-		wfDebugLog( 'thumbnailaccess', time() . ' ' . $thumbPath . ' ' . filesize( $tmpThumbPath ) . ' Generated ' );
-
 		return $thumb;
 	}
 
@@ -1182,8 +1186,6 @@ abstract class File implements IDBAccessObject {
 
 		$params = $this->getHandler()->sanitizeParamsForBucketing( $params );
 
-		$bucketName = $this->getBucketThumbName( $bucket );
-
 		$tmpFile = $this->makeTransformTmpFile( $bucketPath );
 
 		if ( !$tmpFile ) {
@@ -1203,7 +1205,8 @@ abstract class File implements IDBAccessObject {
 		// this object exists
 		$tmpFile->bind( $this );
 
-		RequestContext::getMain()->getStats()->timing( 'media.thumbnail.generate.bucket', $buckettime );
+		RequestContext::getMain()->getStats()->timing(
+			'media.thumbnail.generate.bucket', 1000 * $buckettime );
 
 		return true;
 	}