From: Chad Horohoe <chadh@wikimedia.org>
Date: Fri, 13 Jan 2017 01:01:14 +0000 (-0800)
Subject: Remove check for MW_NO_SETUP
X-Git-Tag: 1.31.0-rc.0~4328^2
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=edc9edbc769b570c;p=lhc%2Fweb%2Fwiklou.git

Remove check for MW_NO_SETUP

This protection is in place for a single extension, Maintenance.
Said extension is probably broken anyway and has been for quite
some time.

Plus, it doesn't even really work like it would intend, the extension
uses special pages and this is a require_once, so a subsequent
request to WebStart.php (which isn't even called by extensions)
wouldn't re-require it.

tldr: This is pointless

Change-Id: I22e7418d2b46c00d4009c370c24ac4b8bc43190a
---

diff --git a/includes/WebStart.php b/includes/WebStart.php
index d063ce3d6e..6e4fb09de0 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -133,9 +133,7 @@ if ( ob_get_level() == 0 ) {
 	ob_start( 'wfOutputHandler' );
 }
 
-if ( !defined( 'MW_NO_SETUP' ) ) {
-	require_once "$IP/includes/Setup.php";
-}
+require_once "$IP/includes/Setup.php";
 
 # Multiple DBs or commits might be used; keep the request as transactional as possible
 if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] === 'POST' ) {