From 5d19c0b1bce396e9c609074587f68d14269fd0b5 Mon Sep 17 00:00:00 2001
From: Ori Livneh <ori@wikimedia.org>
Date: Tue, 5 Mar 2013 16:24:57 -0800
Subject: [PATCH] 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
---
 includes/resourceloader/ResourceLoader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 			}
-- 
2.20.1