From f74f6ee97c1a279f79199f6b7e029e40a4b5f833 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 4 Aug 2011 21:00:40 +0000
Subject: [PATCH] Followup r88270: comment out globals so I can resolve the
 fixme. Throw an exception here so nobody tries using it anyway

---
 includes/conf/Conf.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/conf/Conf.php b/includes/conf/Conf.php
index a2309163e3..b4845cbaf6 100755
--- a/includes/conf/Conf.php
+++ b/includes/conf/Conf.php
@@ -114,9 +114,10 @@ abstract class Conf {
 	 * @return Conf child
 	 */
 	public static function load( $wiki = false ) {
+		throw new MWException( "Not working yet, don't attempt to use this" );
 		if( !self::$__instance ) {
-			global $wgConfiguration;
-			self::$__instance = self::newFromSettings( $wgConfiguration );
+			/**global $wgConfiguration;
+			self::$__instance = self::newFromSettings( $wgConfiguration );*/
 		}
 		if( $wiki && $wiki != self::$__instance->getWikiId() ) {
 			// Load configuration for a different wiki, not sure how
-- 
2.20.1