| Index: branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderContext.php |
| — | — | @@ -63,7 +63,9 @@ |
| 64 | 64 | $this->only = $request->getVal( 'only' ); |
| 65 | 65 | $this->version = $request->getVal( 'version' ); |
| 66 | 66 | |
| 67 | | - if ( !$this->skin ) { |
| | 67 | + $skinnames = Skin::getSkinNames(); |
| | 68 | + // If no skin is specified, or we don't recognize the skin, use the default skin |
| | 69 | + if ( !$this->skin || !isset( $skinnames[$this->skin] ) ) { |
| 68 | 70 | $this->skin = $wgDefaultSkin; |
| 69 | 71 | } |
| 70 | 72 | } |
| Property changes on: branches/wmf/1.19wmf1/includes/resourceloader |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 71 | 73 | Merged /trunk/phase3/includes/resourceloader:r112534 |
| Index: branches/wmf/1.19wmf1/includes/Block.php |
| — | — | @@ -71,6 +71,9 @@ |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | $this->setTarget( $address ); |
| | 75 | + if ( $this->target instanceof User && $user ) { |
| | 76 | + $this->target->setId( $user ); // needed for foreign users |
| | 77 | + } |
| 75 | 78 | if ( $by ) { // local user |
| 76 | 79 | $this->setBlocker( User::newFromID( $by ) ); |
| 77 | 80 | } else { // foreign user |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 78 | 81 | Merged /trunk/phase3/includes:r112534,112563 |
| Index: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js |
| — | — | @@ -1183,7 +1183,8 @@ |
| 1184 | 1184 | * "text/javascript"; if no type is provided, text/javascript is assumed. |
| 1185 | 1185 | * @param async {Boolean} (optional) If true, load modules asynchronously |
| 1186 | 1186 | * even if document ready has not yet occurred. If false (default), |
| 1187 | | - * block before document ready and load async after |
| | 1187 | + * block before document ready and load async after. If not set, true will |
| | 1188 | + * be assumed if loading a URL, and false will be assumed otherwise. |
| 1188 | 1189 | */ |
| 1189 | 1190 | load: function ( modules, type, async ) { |
| 1190 | 1191 | var filtered, m; |
| — | — | @@ -1196,6 +1197,10 @@ |
| 1197 | 1198 | if ( typeof modules === 'string' ) { |
| 1198 | 1199 | // Support adding arbitrary external scripts |
| 1199 | 1200 | if ( /^(https?:)?\/\//.test( modules ) ) { |
| | 1201 | + if ( async === undefined ) { |
| | 1202 | + // Assume async for bug 34542 |
| | 1203 | + async = true; |
| | 1204 | + } |
| 1200 | 1205 | if ( type === 'text/css' ) { |
| 1201 | 1206 | $( 'head' ).append( $( '<link>', { |
| 1202 | 1207 | rel: 'stylesheet', |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1203 | 1208 | Merged /trunk/phase3:r112533-112534,112563 |