https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112741
Revision: 112741
Author: reedy
Date: 2012-02-29 23:34:20 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
MFT r112739, r112740
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/Collection/
Property changes on: branches/wmf/1.19wmf1/extensions/Collection
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JSTesting/extensions/Collection:100352-107913
/branches/REL1_15/phase3/extensions/Collection:51646
/branches/REL1_17/phase3/extensions/Collection:81445,81448
/branches/new-installer/phase3/extensions/Collection:43664-66004
/branches/sqlite/extensions/Collection:58211-58321
/branches/wmf/1.18wmf1/extensions/Collection:97508
/trunk/extensions/Collection: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,112739-112740
/trunk/phase3/extensions/Collection:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Modified: branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
2012-02-29 23:32:20 UTC (rev 112740)
+++ branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
2012-02-29 23:34:20 UTC (rev 112741)
@@ -1145,7 +1145,9 @@
}
$revision = Revision::newFromTitle( $title, $oldid );
- $article['timestamp'] = wfTimestamp( TS_UNIX,
$revision->getTimestamp() );
+ if ( $revision ) {
+ $article['timestamp'] = wfTimestamp( TS_UNIX,
$revision->getTimestamp() );
+ }
$this->renderCollection( array( 'items' => array( $article ) ),
$title, $writer );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
