Merge "wpUndidRevision should be passed along during 'preview' and 'diff'"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 61742c2..ec9f6ba 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -666,6 +666,11 @@ class EditPage {
                        $this->edittime = $request->getVal( 'wpEdittime' );
                        $this->starttime = $request->getVal( 'wpStarttime' );
 
+                       $undidRev = $request->getInt( 'wpUndidRevision' );
+                       if ( $undidRev ) {
+                               $this->undidRev = $undidRev;
+                       }
+
                        $this->scrolltop = $request->getIntOrNull( 'wpScrolltop' );
 
                        if ( $this->textbox1 === '' && $request->getVal( 'wpTextbox1' ) === null ) {