Follow-up r86143: retain query parameters for quick-purge as well as for the full...

diff --git a/includes/actions/PurgeAction.php b/includes/actions/PurgeAction.php
index 3f54b81..74f6e7d 100644 (file)
--- a/includes/actions/PurgeAction.php
+++ b/includes/actions/PurgeAction.php
@@ -25,6 +25,8 @@
 
 class PurgeAction extends FormAction {
 
+       private $redirectParams;
+
        public function getName() {
                return 'purge';
        }
@@ -65,9 +67,14 @@ class PurgeAction extends FormAction {
                $this->checkCanExecute( $this->getUser() );
 
                if ( $this->getUser()->isAllowed( 'purge' ) ) {
+                       $this->redirectParams = wfArrayToCGI( array_diff_key(
+                               $this->getRequest()->getQueryValues(),
+                               array( 'title' => null, 'action' => null )
+                       ) );
                        $this->onSubmit( array() );
                        $this->onSuccess();
                } else {
+                       $this->redirectParams = $this->getRequest()->getVal( 'redirectparams', '' );
                        $form = $this->getForm();
                        if ( $form->show() ) {
                                $this->onSuccess();
@@ -88,6 +95,6 @@ class PurgeAction extends FormAction {
        }
 
        public function onSuccess() {
-               $this->getOutput()->redirect( $this->getTitle()->getFullUrl( $this->getRequest()->getVal( 'redirectparams', '' ) ) );
+               $this->getOutput()->redirect( $this->getTitle()->getFullUrl( $this->redirectParams ) );
        }
 }