| Index: trunk/phase3/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -708,7 +708,8 @@ |
| 709 | 709 | * Convert an array of module names to a packed query string. |
| 710 | 710 | * |
| 711 | 711 | * For example, array( 'foo.bar', 'foo.baz', 'bar.baz', 'bar.quux' ) |
| 712 | | - * becomes 'foo.bar,baz|bar.baz,quux' |
| | 712 | + * becomes 'foo!bar,baz|bar!baz,quux' |
| | 713 | + * The ! is for IE6 being stupid with extensions. |
| 713 | 714 | * @param $modules array of module names (strings) |
| 714 | 715 | * @return string Packed query string |
| 715 | 716 | */ |
| — | — | @@ -726,7 +727,8 @@ |
| 727 | 728 | $p = $prefix === '' ? '' : $prefix . '.'; |
| 728 | 729 | $arr[] = $p . implode( ',', $suffixes ); |
| 729 | 730 | } |
| 730 | | - return implode( '|', $arr ); |
| | 731 | + $str = implode( '|', $arr ); |
| | 732 | + return str_replace( ".", "!", $str ); # bug 28840 |
| 731 | 733 | } |
| 732 | 734 | |
| 733 | 735 | /** |
| Index: trunk/phase3/includes/resourceloader/ResourceLoaderContext.php |
| — | — | @@ -67,12 +67,13 @@ |
| 68 | 68 | /** |
| 69 | 69 | * Expand a string of the form jquery.foo,bar|jquery.ui.baz,quux to |
| 70 | 70 | * an array of module names like array( 'jquery.foo', 'jquery.bar', |
| 71 | | - * 'jquery.ui.baz', 'jquery.ui.quux' ) |
| | 71 | + * 'jquery.ui.baz', 'jquery.ui.quux' ) Also translating ! to . |
| 72 | 72 | * @param $modules String Packed module name list |
| 73 | 73 | * @return array of module names |
| 74 | 74 | */ |
| 75 | 75 | public static function expandModuleNames( $modules ) { |
| 76 | 76 | $retval = array(); |
| | 77 | + $modules = str_replace( "!", ".", $modules ); # bug 28840 - IE is stupid. |
| 77 | 78 | $exploded = explode( '|', $modules ); |
| 78 | 79 | foreach ( $exploded as $group ) { |
| 79 | 80 | if ( strpos( $group, ',' ) === false ) { |
| Index: trunk/phase3/resources/mediawiki/mediawiki.js |
| — | — | @@ -874,7 +874,7 @@ |
| 875 | 875 | var p = prefix === '' ? '' : prefix + '.'; |
| 876 | 876 | arr.push( p + moduleMap[prefix].join( ',' ) ); |
| 877 | 877 | } |
| 878 | | - return arr.join( '|' ); |
| | 878 | + return arr.join( '|' ).replace( /\./g, '!' ); |
| 879 | 879 | } |
| 880 | 880 | |
| 881 | 881 | |