r94329 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r94328‎ | r94329 | r94330 >
Date:08:21, 12 August 2011
Author:krinkle
Status:ok
Tags:
Comment:
Reverting r93751 per r93751 CR.
Modified paths:
  • /trunk/phase3/includes/OutputPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/OutputPage.php
@@ -441,22 +441,6 @@
442442 }
443443
444444 /**
445 - * Remove one or more modules recognized by the resource loader.
446 - *
447 - * @param $modules Mixed: module name (string) or array of module names
448 - */
449 - public function removeModules( $modules ) {
450 - $this->mModules = array_diff( $this->mModules, (array)$modules );
451 - }
452 -
453 - /**
454 - * Removes all modules for resource loader.
455 - */
456 - public function resetModules() {
457 - $this->mModules = array();
458 - }
459 -
460 - /**
461445 * Get the list of module JS to include on this page
462446 *
463447 * @param $filter
@@ -2599,7 +2583,7 @@
26002584 } else {
26012585 # @todo FIXME: This means that User:Me/Common.js doesn't load when previewing
26022586 # User:Me/Vector.js, and vice versa (bug 26283)
2603 -
 2587+
26042588 // We can't do $userScripts[] = 'user'; because the user module would end up
26052589 // being wrapped in a closure, so load it raw like 'site'
26062590 $scripts .= $this->makeResourceLoaderLink( 'user', ResourceLoaderModule::TYPE_SCRIPTS );

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r93751Fixes Bug #29311 - [OutputPage] Create a method to remove items from mModules...mah14:27, 2 August 2011

Status & tagging log