Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/267042
Change subject: Test ...................................................................... Test Change-Id: If390bdfb1894744a588968cbfe1ce2479d927438 --- M includes/GlobalFunctions.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/42/267042/1 diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 4d0ebf6..d6e3340 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -177,7 +177,7 @@ function wfLoadExtension( $ext, $path = null ) { if ( !$path ) { global $wgExtensionDirectory; - $path = "$wgExtensionDirectory/$ext/extension.json"; + $path = "$wgExtensionDirectory/dirname( $ext )/extension.json"; } ExtensionRegistry::getInstance()->queue( $path ); } @@ -199,7 +199,7 @@ global $wgExtensionDirectory; $registry = ExtensionRegistry::getInstance(); foreach ( $exts as $ext ) { - $registry->queue( "$wgExtensionDirectory/$ext/extension.json" ); + $registry->queue( "$wgExtensionDirectory/dirname( $ext )/extension.json" ); } } @@ -214,7 +214,7 @@ function wfLoadSkin( $skin, $path = null ) { if ( !$path ) { global $wgStyleDirectory; - $path = "$wgStyleDirectory/$skin/skin.json"; + $path = "$wgStyleDirectory/dirname( $skin )/skin.json"; } ExtensionRegistry::getInstance()->queue( $path ); } @@ -230,7 +230,7 @@ global $wgStyleDirectory; $registry = ExtensionRegistry::getInstance(); foreach ( $skins as $skin ) { - $registry->queue( "$wgStyleDirectory/$skin/skin.json" ); + $registry->queue( "$wgStyleDirectory/dirname( $skin )/skin.json" ); } } -- To view, visit https://gerrit.wikimedia.org/r/267042 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If390bdfb1894744a588968cbfe1ce2479d927438 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits