| Index: branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php |
| — | — | @@ -555,6 +555,9 @@ |
| 556 | 556 | } |
| 557 | 557 | $collection = CollectionSession::getCollection(); |
| 558 | 558 | $revision = Revision::newFromTitle( $title, $oldid ); |
| | 559 | + if ( !$revision ) { |
| | 560 | + return false; |
| | 561 | + } |
| 559 | 562 | |
| 560 | 563 | $item = array( |
| 561 | 564 | 'type' => 'article', |
| Index: branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php |
| — | — | @@ -381,7 +381,7 @@ |
| 382 | 382 | $this->foreignUserLink( $row['wiki'] ) . |
| 383 | 383 | "</td><td colspan='4'>{$notMerged}</td></tr>\n"; |
| 384 | 384 | } |
| 385 | | - return implode( '\n', $rows ); |
| | 385 | + return implode( "\n", $rows ); |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | /** |
| Property changes on: branches/wmf/1.19wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 389 | 389 | Merged /trunk/extensions:r112571,112628 |