From 755a097c945d951040bb2e29619bce59dc59912e Mon Sep 17 00:00:00 2001 From: Tobias Date: Sat, 5 Jun 2010 11:59:48 +0000 Subject: [PATCH] follow-up on r67094: fixing presumed cause for php strict standards message and adding to release-notes --- RELEASE-NOTES | 3 +++ includes/specials/SpecialRevisionMove.php | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index aac8f01d9c..2e1e67d8fa 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -77,6 +77,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN notified about the beginning and finishing of LivePreview actions. * (bug 21278) Now the sidebar allows inclusion of wiki markup. * (bug 23733) Add IDs to messages used on CSS/JS pages +* (bug 21312) RevisionMove allows moving individual revisions of a page to + another page. Introducing 'revisionmove' user right; disabled by default; + experimental feature. === Bug fixes in 1.17 === * (bug 17560) Half-broken deletion moved image files to deletion archive diff --git a/includes/specials/SpecialRevisionMove.php b/includes/specials/SpecialRevisionMove.php index ab6d1a1dae..4aa5e10447 100644 --- a/includes/specials/SpecialRevisionMove.php +++ b/includes/specials/SpecialRevisionMove.php @@ -48,12 +48,10 @@ class SpecialRevisionMove extends UnlistedSpecialPage { /** * @param $par subpage part, standard special page parameter, is ignored here - * @param $request optional WebRequest object. If it isn't set, $this->request - * will be set to $wgRequest * * Mostly initializes variables and calls either showForm() or submit() */ - public function execute( $par = '', $request = null ) { + public function execute( $par = '' ) { global $wgUser, $wgOut, $wgSkin; $this->setHeaders(); @@ -62,10 +60,8 @@ class SpecialRevisionMove extends UnlistedSpecialPage { $this->mIsAllowedRevisionMove = $wgUser->isAllowed( 'revisionmove' ); $this->user = $wgUser; $this->skin = $wgUser->getSkin(); - if ( !$request instanceof WebRequest ) { + if ( !$this->request instanceof WebRequest ) { $this->request = $GLOBALS['wgRequest']; - } else { - $this->request = $request; } # Get correct title -- 2.20.1