From 0d051f6a4f3bdc4e9eb2508a0a180f20b29f54ff Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Thu, 7 Aug 2014 11:27:36 +0100 Subject: [PATCH] ResourceLoaderFileModule::extractBasePaths: Simplify if condition Change-Id: I69f090595629dabefaa0c6ddaa9a793a2f86ecfd --- includes/resourceloader/ResourceLoaderFileModule.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php index c3a36e4ecc..03a9829a31 100644 --- a/includes/resourceloader/ResourceLoaderFileModule.php +++ b/includes/resourceloader/ResourceLoaderFileModule.php @@ -305,9 +305,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { // but were preserved for backwards-compatibility just in case. Tread lightly. $localBasePath = $localBasePath === null ? $IP : $localBasePath; - if ( $remoteBasePath !== null ) { - $remoteBasePath = $remoteBasePath; - } else { + if ( $remoteBasePath === null ) { $remoteBasePath = $wgResourceBasePath === null ? $wgScriptPath : $wgResourceBasePath; } -- 2.20.1