* (bug 6617) Validate timestamps on Special:Undelete

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1e1f8fd..4fe7034 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -254,6 +254,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Committed a bunch of live hacks from Wikimedia servers
 * (bug 6889) PHP notices in thumb.php with missing params
 * Cleaner error behavior on thumb.php with invalid page selection
+* (bug 6617) Validate timestamps on Special:Undelete
 
 
 == Languages updated ==

diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index c91f1a9..1db80e5 100644 (file)
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -396,9 +396,10 @@ class UndeleteForm {
 
        function UndeleteForm( &$request, $par = "" ) {
                global $wgUser;
-               $this->mAction = $request->getText( 'action' );
-               $this->mTarget = $request->getText( 'target' );
-               $this->mTimestamp = $request->getText( 'timestamp' );
+               $this->mAction = $request->getVal( 'action' );
+               $this->mTarget = $request->getVal( 'target' );
+               $time = $request->getVal( 'timestamp' );
+               $this->mTimestamp = $time ? wfTimestamp( TS_MW, $time ) : '';
                $this->mFile = $request->getVal( 'file' );
                
                $posted = $request->wasPosted() &&