Bump and prep 1.34.1

[lhc/web/wiklou.git] / thumb.php

diff --git a/thumb.php b/thumb.php
index 5be1ed0..2bb6065 100644 (file)
--- a/thumb.php
+++ b/thumb.php
@@ -25,7 +25,11 @@ use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 
 define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
-define( 'MW_ENTRY_POINT', 'thumb' );
+// T241340: thumb.php is included by thumb_handler.php which already defined
+// MW_ENTRY_POINT to 'thumb_handler'
+if ( !defined( 'MW_ENTRY_POINT' ) ) {
+       define( 'MW_ENTRY_POINT', 'thumb' );
+}
 require __DIR__ . '/includes/WebStart.php';
 
 // Don't use fancy MIME detection, just check the file extension for jpg/gif/png
@@ -524,7 +528,7 @@ function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath
  * /w/images/thumb/a/ab/Foo.png/120px-Foo.png. The $thumbRel parameter
  * of this function would be set to "a/ab/Foo.png/120px-Foo.png".
  * This method is responsible for turning that into an array
- * with the folowing keys:
+ * with the following keys:
  *  * f => the filename (Foo.png)
  *  * rel404 => the whole thing (a/ab/Foo.png/120px-Foo.png)
  *  * archived => 1 (If the request is for an archived thumb)