| Index: branches/REL1_17/phase3/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -703,8 +703,7 @@ |
| 704 | 704 | * Convert an array of module names to a packed query string. |
| 705 | 705 | * |
| 706 | 706 | * For example, array( 'foo.bar', 'foo.baz', 'bar.baz', 'bar.quux' ) |
| 707 | | - * becomes 'foo!bar,baz|bar!baz,quux' |
| 708 | | - * The ! is for IE6 being stupid with extensions. |
| | 707 | + * becomes 'foo.bar,baz|bar.baz,quux' |
| 709 | 708 | * @param $modules array of module names (strings) |
| 710 | 709 | * @return string Packed query string |
| 711 | 710 | */ |
| — | — | @@ -722,8 +721,7 @@ |
| 723 | 722 | $p = $prefix === '' ? '' : $prefix . '.'; |
| 724 | 723 | $arr[] = $p . implode( ',', $suffixes ); |
| 725 | 724 | } |
| 726 | | - $str = implode( '|', $arr ); |
| 727 | | - return str_replace( ".", "!", $str ); # bug 28840 |
| | 725 | + return implode( '|', $arr ); |
| 728 | 726 | } |
| 729 | 727 | |
| 730 | 728 | /** |
| Property changes on: branches/REL1_17/phase3/includes/resourceloader/ResourceLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 731 | 729 | Reverse-merged /trunk/phase3/includes/resourceloader/ResourceLoader.php:r87711 |
| Index: branches/REL1_17/phase3/includes/resourceloader/ResourceLoaderContext.php |
| — | — | @@ -67,13 +67,12 @@ |
| 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' ) Also translating ! to . |
| | 71 | + * 'jquery.ui.baz', 'jquery.ui.quux' ) |
| 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. |
| 78 | 77 | $exploded = explode( '|', $modules ); |
| 79 | 78 | foreach ( $exploded as $group ) { |
| 80 | 79 | if ( strpos( $group, ',' ) === false ) { |
| Index: branches/REL1_17/phase3/resources/mediawiki/mediawiki.js |
| — | — | @@ -686,7 +686,7 @@ |
| 687 | 687 | var p = prefix === '' ? '' : prefix + '.'; |
| 688 | 688 | arr.push( p + moduleMap[prefix].join( ',' ) ); |
| 689 | 689 | } |
| 690 | | - return arr.join( '|' ).replace( /\./g, '!' ); |
| | 690 | + return arr.join( '|' ); |
| 691 | 691 | } |
| 692 | 692 | |
| 693 | 693 | |
| Property changes on: branches/REL1_17/phase3/resources/mediawiki/mediawiki.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 694 | 694 | Reverse-merged /trunk/phase3/resources/mediawiki/mediawiki.js:r87711 |