https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112564
Revision: 112564
Author: aaron
Date: 2012-02-28 02:09:18 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
MFT r112563, r112533, r112534
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/Block.php
branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderContext.php
branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
branches/wmf/1.19wmf1/includes/resourceloader/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173,112179,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173,112179,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112534,112563
Modified: branches/wmf/1.19wmf1/includes/Block.php
===================================================================
--- branches/wmf/1.19wmf1/includes/Block.php 2012-02-28 02:04:30 UTC (rev
112563)
+++ branches/wmf/1.19wmf1/includes/Block.php 2012-02-28 02:09:18 UTC (rev
112564)
@@ -71,6 +71,9 @@
}
$this->setTarget( $address );
+ if ( $this->target instanceof User && $user ) {
+ $this->target->setId( $user ); // needed for foreign
users
+ }
if ( $by ) { // local user
$this->setBlocker( User::newFromID( $by ) );
} else { // foreign user
Property changes on: branches/wmf/1.19wmf1/includes/resourceloader
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes/resourceloader:100352-107913
/branches/REL1_15/phase3/includes/resourceloader:51646
/branches/new-installer/phase3/includes/resourceloader:43664-66004
/branches/sqlite/includes/resourceloader:58211-58321
/branches/wmf/1.18wmf1/includes/resourceloader:97508,111667
/branches/wmf-deployment/includes/resourceloader:53381
/trunk/phase3/includes/resourceloader:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112052,112184
+ /branches/JSTesting/includes/resourceloader:100352-107913
/branches/REL1_15/phase3/includes/resourceloader:51646
/branches/new-installer/phase3/includes/resourceloader:43664-66004
/branches/sqlite/includes/resourceloader:58211-58321
/branches/wmf/1.18wmf1/includes/resourceloader:97508,111667
/branches/wmf-deployment/includes/resourceloader:53381
/trunk/phase3/includes/resourceloader:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112052,112184,112534
Modified:
branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderContext.php
===================================================================
--- branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderContext.php
2012-02-28 02:04:30 UTC (rev 112563)
+++ branches/wmf/1.19wmf1/includes/resourceloader/ResourceLoaderContext.php
2012-02-28 02:09:18 UTC (rev 112564)
@@ -63,7 +63,9 @@
$this->only = $request->getVal( 'only' );
$this->version = $request->getVal( 'version' );
- if ( !$this->skin ) {
+ $skinnames = Skin::getSkinNames();
+ // If no skin is specified, or we don't recognize the skin, use
the default skin
+ if ( !$this->skin || !isset( $skinnames[$this->skin] ) ) {
$this->skin = $wgDefaultSkin;
}
}
Modified: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js
===================================================================
--- branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js 2012-02-28
02:04:30 UTC (rev 112563)
+++ branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.js 2012-02-28
02:09:18 UTC (rev 112564)
@@ -1183,7 +1183,8 @@
* "text/javascript"; if no type is provided,
text/javascript is assumed.
* @param async {Boolean} (optional) If true,
load modules asynchronously
* even if document ready has not yet
occurred. If false (default),
- * block before document ready and load async
after
+ * block before document ready and load async
after. If not set, true will
+ * be assumed if loading a URL, and false will
be assumed otherwise.
*/
load: function ( modules, type, async ) {
var filtered, m;
@@ -1196,6 +1197,10 @@
if ( typeof modules === 'string' ) {
// Support adding arbitrary
external scripts
if ( /^(https?:)?\/\//.test(
modules ) ) {
+ if ( async ===
undefined ) {
+ // Assume async
for bug 34542
+ async = true;
+ }
if ( type ===
'text/css' ) {
$( 'head'
).append( $( '<link>', {
rel:
'stylesheet',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
