fixes ProfessionalWiki#401; resource loading broken when maps not located directory named 'extensions'

Author: oetterer

Maps.resources.php

@@ -13,7 +13,7 @@
  */
 return call_user_func( function() {
 
-	$pathParts = ( explode( DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR, __DIR__, 2 ) );
+	$pathParts = explode( '/', str_replace( DIRECTORY_SEPARATOR, '/', __DIR__ ) );
 
 	$moduleTemplate = [
 		'position' => 'top',

includes/services/GoogleMaps3/GoogleMaps3.php

@@ -21,12 +21,13 @@
 	function () {
 		global $wgResourceModules;
 
-		$pathParts = ( explode( DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR, __DIR__, 2 ) );
+		$pathParts = explode( '/', str_replace( DIRECTORY_SEPARATOR, '/', __DIR__ ) );
+		$remoteExtPath = implode( DIRECTORY_SEPARATOR, array_slice( $pathParts, -4 ) );
 
 		$wgResourceModules['ext.maps.googlemaps3'] = [
 			'dependencies' => [ 'ext.maps.common' ],
 			'localBasePath' => __DIR__,
-			'remoteExtPath' => end( $pathParts ),
+			'remoteExtPath' => $remoteExtPath,
 			'group' => 'ext.maps',
 			'targets' => [
 				'mobile',
@@ -47,7 +48,7 @@ function () {
 
 		$wgResourceModules['ext.maps.gm3.markercluster'] = [
 			'localBasePath' => __DIR__ . '/gm3-util-library',
-			'remoteExtPath' => end( $pathParts ),
+			'remoteExtPath' => $remoteExtPath . '/gm3-util-library',
 			'group' => 'ext.maps',
 			'targets' => [
 				'mobile',
@@ -60,7 +61,7 @@ function () {
 
 		$wgResourceModules['ext.maps.gm3.markerwithlabel'] = [
 			'localBasePath' => __DIR__ . '/gm3-util-library',
-			'remoteExtPath' => end( $pathParts ),
+			'remoteExtPath' => $remoteExtPath  . '/gm3-util-library',
 			'group' => 'ext.maps',
 			'targets' => [
 				'mobile',
@@ -76,8 +77,8 @@ function () {
 
 		$wgResourceModules['ext.maps.gm3.geoxml'] = [
 			'localBasePath' => __DIR__ . '/geoxml3',
-			'remoteExtPath' => end( $pathParts ),
-			'group' => 'ext.maps',
+			'remoteExtPath' => $remoteExtPath,
+			'group' => 'ext.maps' . '/geoxml3',
 			'targets' => [
 				'mobile',
 				'desktop'
@@ -91,7 +92,7 @@ function () {
 
 		$wgResourceModules['ext.maps.gm3.earth'] = [
 			'localBasePath' => __DIR__ . '/gm3-util-library',
-			'remoteExtPath' => end( $pathParts ),
+			'remoteExtPath' => $remoteExtPath  . '/gm3-util-library',
 			'group' => 'ext.maps',
 			'targets' => [
 				'mobile',

includes/services/Leaflet/Leaflet.php

@@ -22,12 +22,13 @@
 	function () {
 		global $wgResourceModules;
 
-		$pathParts = ( explode( DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR, __DIR__, 2 ) );
+		$pathParts = explode( '/', str_replace( DIRECTORY_SEPARATOR, '/', __DIR__ ) );
+		$remoteExtPath = implode( DIRECTORY_SEPARATOR, array_slice( $pathParts, -4 ) );
 
 		$wgResourceModules['ext.maps.leaflet'] = [
 			'dependencies' => [ 'ext.maps.common' ],
 			'localBasePath' => __DIR__,
-			'remoteExtPath' => end( $pathParts ),
+			'remoteExtPath' => $remoteExtPath,
 			'group' => 'ext.maps',
 			'targets' => [
 				'mobile',
@@ -47,7 +48,7 @@ function () {
 		$wgResourceModules['ext.maps.leaflet.fullscreen'] = [
 			'dependencies' => [ 'ext.maps.leaflet' ],
 			'localBasePath' => __DIR__ . '/leaflet.fullscreen',
-			'remoteExtPath' => end( $pathParts ) . '/leaflet.fullscreen',
+			'remoteExtPath' => $remoteExtPath . '/leaflet.fullscreen',
 			'group' => 'ext.maps',
 			'targets' => [
 				'mobile',
@@ -64,7 +65,7 @@ function () {
 		$wgResourceModules['ext.maps.leaflet.markercluster'] = [
 			'dependencies' => [ 'ext.maps.leaflet' ],
 			'localBasePath' => __DIR__ . '/leaflet.markercluster',
-			'remoteExtPath' => end( $pathParts ),
+			'remoteExtPath' => $remoteExtPath . '/leaflet.markercluster',
 			'group' => 'ext.maps',
 			'targets' => [
 				'mobile',
@@ -81,7 +82,7 @@ function () {
 		$wgResourceModules['ext.maps.leaflet.providers'] = [
 			'dependencies' => [ 'ext.maps.leaflet' ],
 			'localBasePath' => __DIR__ . '/leaflet-providers',
-			'remoteExtPath' => end( $pathParts ) . '/leaflet-providers',
+			'remoteExtPath' => $remoteExtPath . '/leaflet-providers',
 			'group' => 'ext.maps',
 			'targets' => [
 				'mobile',

includes/services/OpenLayers/OpenLayers.php

@@ -21,12 +21,13 @@
 	function () {
 		global $wgResourceModules;
 
-		$pathParts = ( explode( DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR, __DIR__, 2 ) );
+		$pathParts = explode( '/', str_replace( DIRECTORY_SEPARATOR, '/', __DIR__ ) );
+		$remoteExtPath = implode( DIRECTORY_SEPARATOR, array_slice( $pathParts, -4 ) );
 
 		$wgResourceModules['ext.maps.openlayers'] = [
 			'dependencies' => [ 'ext.maps.common' ],
 			'localBasePath' => __DIR__,
-			'remoteExtPath' => end( $pathParts ),
+			'remoteExtPath' => $remoteExtPath,
 			'group' => 'ext.maps',
 			'targets' => [
 				'mobile',