From: Kunal Mehta <legoktm@gmail.com>
Date: Wed, 7 Jan 2015 18:27:01 +0000 (-0800)
Subject: Only try to load UtfNormalDefines.php once
X-Git-Tag: 1.31.0-rc.0~12583^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=72df08286a78a2ba307690cd47d1aa7e72103aa6;p=lhc%2Fweb%2Fwiklou.git

Only try to load UtfNormalDefines.php once

It's already loaded in Defines.php, so no need to do it again

Change-Id: Ie6f3bf3fbbcbaadd85cfc8e54527b93e98f7b898
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 4e63d9186e..ed0aabe8e7 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -480,7 +480,6 @@ if ( !class_exists( 'AutoLoader' ) ) {
 MWExceptionHandler::installHandler();
 
 require_once "$IP/includes/normal/UtfNormalUtil.php";
-require_once "$IP/includes/normal/UtfNormalDefines.php";
 
 $ps_default2 = Profiler::instance()->scopedProfileIn( $fname . '-defaults2' );