From: Ori Livneh <ori@wikimedia.org>
Date: Wed, 6 Mar 2013 00:24:57 +0000 (-0800)
Subject: Avoid instantiating ResourceLoader modules twice
X-Git-Tag: 1.31.0-rc.0~20470
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=5d19c0b1bce396e9c609074587f68d14269fd0b5;p=lhc%2Fweb%2Fwiklou.git

Avoid instantiating ResourceLoader modules twice

Commit 13169c88 seperated out the call to getModule from the assignment to the
$modules array in order to add a check for private modules, so they can be
filtered out (see bug 34907). This had the (presumably unintended) side-effect
of causing modules to be instantiated twice.

Change-Id: Iccd7f3d3d473c5a43107842ed4e1cf08857a3886
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 5abe2260f4..52f200900a 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -451,7 +451,7 @@ class ResourceLoader {
 					$this->hasErrors = true;
 					continue;
 				}
-				$modules[$name] = $this->getModule( $name );
+				$modules[$name] = $module;
 			} else {
 				$missing[] = $name;
 			}