Merge "Fatal error: Call to a member function getId() on a non-object in /usr/local...

diff --git a/includes/EditPage.php b/includes/EditPage.php
index dce8d91..015099a 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -819,7 +819,7 @@ class EditPage {
 
                                                        # If we just undid one rev, use an autosummary
                                                        $firstrev = $oldrev->getNext();
-                                                       if ( $firstrev->getId() == $undo ) {
+                                                       if ( $firstrev && $firstrev->getId() == $undo ) {
                                                                $undoSummary = wfMsgForContent( 'undo-summary', $undo, $undorev->getUserText() );
                                                                if ( $this->summary === '' ) {
                                                                        $this->summary = $undoSummary;