| Index: branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php |
| — | — | @@ -1145,7 +1145,9 @@ |
| 1146 | 1146 | } |
| 1147 | 1147 | |
| 1148 | 1148 | $revision = Revision::newFromTitle( $title, $oldid ); |
| 1149 | | - $article['timestamp'] = wfTimestamp( TS_UNIX, $revision->getTimestamp() ); |
| | 1149 | + if ( $revision ) { |
| | 1150 | + $article['timestamp'] = wfTimestamp( TS_UNIX, $revision->getTimestamp() ); |
| | 1151 | + } |
| 1150 | 1152 | |
| 1151 | 1153 | $this->renderCollection( array( 'items' => array( $article ) ), $title, $writer ); |
| 1152 | 1154 | } |
| Property changes on: branches/wmf/1.19wmf1/extensions/Collection |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 1153 | 1155 | Merged /branches/sqlite/extensions/Collection:r58211-58321 |
| 1154 | 1156 | Merged /trunk/phase3/extensions/Collection:r111002,111029,111034,111062,111067,111076,111085,111128,111144,111251 |
| 1155 | 1157 | Merged /branches/new-installer/phase3/extensions/Collection:r43664-66004 |
| 1156 | 1158 | Merged /branches/JSTesting/extensions/Collection:r100352-107913 |
| 1157 | 1159 | Merged /branches/REL1_15/phase3/extensions/Collection:r51646 |
| 1158 | 1160 | Merged /branches/wmf/1.18wmf1/extensions/Collection:r97508 |
| 1159 | 1161 | Merged /branches/REL1_17/phase3/extensions/Collection:r81445,81448 |
| 1160 | 1162 | Merged /trunk/extensions/Collection:r111043,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 |