Fix bug in r87497, reported in CR: &modules=foo,bar,baz would look for '.foo', '...
authorRoan Kattouw <catrope@users.mediawiki.org>
Sat, 14 May 2011 13:34:03 +0000 (13:34 +0000)
committerRoan Kattouw <catrope@users.mediawiki.org>
Sat, 14 May 2011 13:34:03 +0000 (13:34 +0000)
includes/resourceloader/ResourceLoaderContext.php

index 581f971..f81f7ca 100644 (file)
@@ -83,10 +83,16 @@ class ResourceLoaderContext {
                        } else {
                                // This is a set of modules in foo.bar,baz notation
                                $pos = strrpos( $group, '.' );
-                               $prefix = substr( $group, 0, $pos ); // 'foo'
-                               $suffixes = explode( ',', substr( $group, $pos + 1 ) ); // array( 'bar', 'baz' )
-                               foreach ( $suffixes as $suffix ) {
-                                       $retval[] = "$prefix.$suffix";
+                               if ( $pos === false ) {
+                                       // Prefixless modules, i.e. without dots
+                                       $retval = explode( ',', $group );
+                               } else {
+                                       // We have a prefix and a bunch of suffixes
+                                       $prefix = substr( $group, 0, $pos ); // 'foo'
+                                       $suffixes = explode( ',', substr( $group, $pos + 1 ) ); // array( 'bar', 'baz' )
+                                       foreach ( $suffixes as $suffix ) {
+                                               $retval[] = "$prefix.$suffix";
+                                       }
                                }
                        }
                }