From: Krinkle <krinkle@users.mediawiki.org>
Date: Fri, 12 Aug 2011 08:21:22 +0000 (+0000)
Subject: Reverting r93751 per r93751 CR.
X-Git-Tag: 1.31.0-rc.0~28332
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=2aff6544d6222aba1e70719ac3cdc07ab935018e;p=lhc%2Fweb%2Fwiklou.git

Reverting r93751 per r93751 CR.
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b93e20a2ed..adfe20ed5f 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -440,22 +440,6 @@ class OutputPage extends ContextSource {
 		$this->mModules = array_merge( $this->mModules, (array)$modules );
 	}
 
-	/**
-	 * Remove one or more modules recognized by the resource loader.
-	 *
-	 * @param $modules Mixed: module name (string) or array of module names
-	 */
-	public function removeModules( $modules ) {
-		$this->mModules = array_diff( $this->mModules, (array)$modules );
-	}
-
-	/**
-	 * Removes all modules for resource loader.
-	 */
-	public function resetModules() {
-		$this->mModules = array();
-	}
-
 	/**
 	 * Get the list of module JS to include on this page
 	 *
@@ -2599,7 +2583,7 @@ $templates
 			} else {
 				# @todo FIXME: This means that User:Me/Common.js doesn't load when previewing
 				# User:Me/Vector.js, and vice versa (bug 26283)
-
+				
 				// We can't do $userScripts[] = 'user'; because the user module would end up
 				// being wrapped in a closure, so load it raw like 'site'
 				$scripts .= $this->makeResourceLoaderLink( 'user', ResourceLoaderModule::TYPE_SCRIPTS );