https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112634
Revision: 112634
Author: reedy
Date: 2012-02-28 20:46:08 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
MFT r112571, r112628
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/
Property changes on: branches/wmf/1.19wmf1/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112613
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
+ /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112613,112628
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Modified:
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
2012-02-28 20:43:27 UTC (rev 112633)
+++
branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
2012-02-28 20:46:08 UTC (rev 112634)
@@ -381,7 +381,7 @@
$this->foreignUserLink( $row['wiki'] ) .
"</td><td colspan='4'>{$notMerged}</td></tr>\n";
}
- return implode( '\n', $rows );
+ return implode( "\n", $rows );
}
/**
Modified: branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
2012-02-28 20:43:27 UTC (rev 112633)
+++ branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
2012-02-28 20:46:08 UTC (rev 112634)
@@ -555,6 +555,9 @@
}
$collection = CollectionSession::getCollection();
$revision = Revision::newFromTitle( $title, $oldid );
+ if ( !$revision ) {
+ return false;
+ }
$item = array(
'type' => 'article',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
