Merge "Passing the undid revisionId from the API request to the WebRequest"

diff --combined includes/api/ApiEditPage.php
index ec1b06e,3c48d2c..4cb91bc
--- 1/includes/api/ApiEditPage.php
--- 2/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@@ -246,6 -246,11 +246,11 @@@ class ApiEditPage extends ApiBase 
                        $requestArray['wpSectionTitle'] = $params['sectiontitle'];
                }
  
+               // TODO: Pass along information from 'undoafter' as well
+               if ( $params['undo'] > 0 ) {
+                       $requestArray['wpUndidRevision'] = $params['undo'];
+               }
+ 
                // Watch out for basetimestamp == ''
                // wfTimestamp() treats it as NOW, almost certainly causing an edit conflict
                if ( !is_null( $params['basetimestamp'] ) && $params['basetimestamp'] != '' ) {
@@@ -568,7 -573,7 +573,7 @@@
                        'watch' => 'Add the page to your watchlist',
                        'unwatch' => 'Remove the page from your watchlist',
                        'watchlist' => 'Unconditionally add or remove the page from your watchlist, use preferences or do not change watch',
 -                      'md5' => array( "The MD5 hash of the {$p}text parameter, or the {$p}prependtext and {$p}appendtext parameters concatenated.",
 +                      'md5' => array( "The MD5 hash of the {$p}text parameter, or the {$p}prependtext and {$p}appendtext parameters concatenated.",
                                        'If set, the edit won\'t be done unless the hash is correct' ),
                        'prependtext' => "Add this text to the beginning of the page. Overrides {$p}text",
                        'appendtext' => array( "Add this text to the end of the page. Overrides {$p}text.",