From 00349ab0ebf84505fd388fd5e2895a8bff41195f Mon Sep 17 00:00:00 2001
From: Florian <florian.schmidt.stargatewissen@gmail.com>
Date: Fri, 22 Jan 2016 17:47:26 +0100
Subject: [PATCH] Register ext.uls.eventlogger conditionally

The ext.uls.eventlogger module is now registered depending on
the configuration variable $wgULSEventLogging. This will prevent
the Structuretest Resourcetest to fail, if EventLogging isn't
installed on the test system (like on my jenkins environment :P).

Change-Id: I1e2545492ec04fb043638765ac42f09da89813e9
---
 UniversalLanguageSelector.hooks.php | 16 +++++++++++++++-
 extension.json                      |  9 ---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index c5e2f305..8080748f 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -404,7 +404,7 @@ class UniversalLanguageSelectorHooks {
 	 * @return boolean true
 	 */
 	public static function onResourceLoaderRegisterModules( ResourceLoader &$resourceLoader ) {
-		global $wgResourceModules;
+		global $wgResourceModules, $wgULSEventLogging;
 
 		if (
 			(
@@ -452,6 +452,20 @@ class UniversalLanguageSelectorHooks {
 			) );
 		}
 
+		if ( $wgULSEventLogging ) {
+			$resourceLoader->register( array(
+				'ext.uls.eventlogger' => array(
+					'scripts' => 'js/ext.uls.eventlogger.js',
+					'dependencies' => array(
+						'mediawiki.user',
+						'schema.UniversalLanguageSelector',
+					),
+					'localBasePath' => __DIR__ . '/resources',
+					'remoteExtPath' => 'UniversalLanguageSelector/resources',
+				),
+			) );
+		}
+
 		return true;
 	}
 }
diff --git a/extension.json b/extension.json
index c6dfd9bc..a739c61d 100644
--- a/extension.json
+++ b/extension.json
@@ -163,15 +163,6 @@
 			"localBasePath": "resources",
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
-		"ext.uls.eventlogger": {
-			"scripts": "js/ext.uls.eventlogger.js",
-			"dependencies": [
-				"mediawiki.user",
-				"schema.UniversalLanguageSelector"
-			],
-			"localBasePath": "resources",
-			"remoteExtPath": "UniversalLanguageSelector/resources"
-		},
 		"ext.uls.i18n": {
 			"scripts": "js/ext.uls.i18n.js",
 			"dependencies": [