http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93751
Revision: 93751
Author: mah
Date: 2011-08-02 14:27:48 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
Fixes Bug #29311 - [OutputPage] Create a method to remove items from mModules
Patch from John Du Hart, reviewed by Roan, Applying at Roan's request.
Modified Paths:
--------------
trunk/phase3/includes/OutputPage.php
Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php 2011-08-02 14:22:32 UTC (rev
93750)
+++ trunk/phase3/includes/OutputPage.php 2011-08-02 14:27:48 UTC (rev
93751)
@@ -441,6 +441,22 @@
}
/**
+ * 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
*
* @param $filter
@@ -2571,7 +2587,7 @@
} 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 );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
