From 476413e2ee9486e1b8c692e48f672ea67e44f4e5 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Mon, 23 Dec 2019 18:17:14 +0000
Subject: [PATCH] Don't redefine MW_ENTRY_POINT in thumb.php if already defined

Bug: T241340
Change-Id: I95914267bf22910391a54ec524ed11bc076f83e3
---
 thumb.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/thumb.php b/thumb.php
index bedf171510..1f98c39977 100644
--- 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
-- 
2.20.1