From f63ad4bf9fe8247e9cb33e74a50e67e84afc732c Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Tue, 14 Dec 2010 00:08:54 +0000
Subject: [PATCH] merging the two addModules() calls into one, (they take an
 array, so might as well me together); + using mw instead of mediaWiki in
 mediawiki.util.js

---
 includes/OutputPage.php                    | 3 +--
 resources/mediawiki.util/mediawiki.util.js | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 92f2c9f89c..de50c060bd 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1617,8 +1617,7 @@ class OutputPage {
 		$sk = $wgUser->getSkin();
 
 		// Add base resources
-		$this->addModules( array( 'mediawiki.legacy.wikibits' ) );
-		$this->addModules( array( 'mediawiki.util' ) );
+		$this->addModules( array( 'mediawiki.legacy.wikibits', 'mediawiki.util' ) );
 
 		// Add various resources if required
 		if ( $wgUseAjax ) {
diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki.util/mediawiki.util.js
index 1d3893755a..bc17158ba4 100644
--- a/resources/mediawiki.util/mediawiki.util.js
+++ b/resources/mediawiki.util/mediawiki.util.js
@@ -4,7 +4,7 @@
 
 (function ($, mw) {
 
-	mediaWiki.util = {
+	mw.util = {
 
 		/* Initialisation */
 		'initialised' : false,
@@ -363,6 +363,6 @@
 
 	};
 
-	mediaWiki.util.init();
+	mw.util.init();
 
-})(jQuery, mediaWiki);
+})(jQuery, mediaWiki);
\ No newline at end of file
-- 
2.20.1