X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=thumb.php;h=7352dc4c5b8270c0cc038da8ae3fcaf5a7fee2f2;hb=1157312f1e5fe2641784f5c6d0d5ad93dca24f38;hp=3d8612d9726988ec17bbb21029b38f2e581905c6;hpb=a56c35a226fea3a3548a0313ce8fb748cfeb3d5a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/thumb.php b/thumb.php
index 3d8612d972..7352dc4c5b 100644
--- a/thumb.php
+++ b/thumb.php
@@ -92,7 +92,6 @@ function wfThumbHandle404() {
 function wfStreamThumb( array $params ) {
 	global $wgVaryOnXFP;
 
-	$section = new ProfileSection( __METHOD__ );
 
 	$headers = array(); // HTTP headers to send
 
@@ -135,12 +134,12 @@ function wfStreamThumb( array $params ) {
 		// Format is <timestamp>!<name>
 		$bits = explode( '!', $fileName, 2 );
 		if ( count( $bits ) != 2 ) {
-			wfThumbError( 404, wfMessage( 'badtitletext' )->text() );
+			wfThumbError( 404, wfMessage( 'badtitletext' )->parse() );
 			return;
 		}
 		$title = Title::makeTitleSafe( NS_FILE, $bits[1] );
 		if ( !$title ) {
-			wfThumbError( 404, wfMessage( 'badtitletext' )->text() );
+			wfThumbError( 404, wfMessage( 'badtitletext' )->parse() );
 			return;
 		}
 		$img = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $title, $fileName );
@@ -150,7 +149,7 @@ function wfStreamThumb( array $params ) {
 
 	// Check the source file title
 	if ( !$img ) {
-		wfThumbError( 404, wfMessage( 'badtitletext' )->text() );
+		wfThumbError( 404, wfMessage( 'badtitletext' )->parse() );
 		return;
 	}
 
@@ -262,7 +261,7 @@ function wfStreamThumb( array $params ) {
 		return;
 	}
 
-	// For 404 handled thumbnails, we only use the the base name of the URI
+	// For 404 handled thumbnails, we only use the base name of the URI
 	// for the thumb params and the parent directory for the source file name.
 	// Check that the zone relative path matches up so squid caches won't pick
 	// up thumbs that would not be purged on source file deletion (bug 34231).
@@ -310,10 +309,10 @@ function wfStreamThumb( array $params ) {
 
 	$user = RequestContext::getMain()->getUser();
 	if ( !wfThumbIsStandard( $img, $params ) && $user->pingLimiter( 'renderfile-nonstandard' ) ) {
-		wfThumbError( 500, wfMessage( 'actionthrottledtext' ) );
+		wfThumbError( 500, wfMessage( 'actionthrottledtext' )->parse() );
 		return;
 	} elseif ( $user->pingLimiter( 'renderfile' ) ) {
-		wfThumbError( 500, wfMessage( 'actionthrottledtext' ) );
+		wfThumbError( 500, wfMessage( 'actionthrottledtext' )->parse() );
 		return;
 	}
 
@@ -598,7 +597,7 @@ function wfExtractThumbParams( $file, $params ) {
  * Output a thumbnail generation error message
  *
  * @param int $status
- * @param string $msg
+ * @param string $msg HTML
  * @return void
  */
 function wfThumbError( $status, $msg ) {