1 files changed, 26 insertions, 4 deletions

diff --git a/includes/specials/SpecialRandompage.php b/includes/specials/SpecialRandompage.php
index fd3f17f2..6299f384 100644
--- a/includes/specials/SpecialRandompage.php
+++ b/includes/specials/SpecialRandompage.php
@@ -1,11 +1,31 @@
 <?php
+/**
+ * Implements Special:Randompage
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ * @author Rob Church <robchur@gmail.com>, Ilmari Karonen
+ */
 
 /**
  * Special page to direct the user to a random page
  *
  * @ingroup SpecialPage
- * @author Rob Church <robchur@gmail.com>, Ilmari Karonen
- * @license GNU General Public Licence 2.0 or later
  */
 class RandomPage extends SpecialPage {
 	private $namespaces;  // namespaces to select pages from
@@ -33,7 +53,7 @@ class RandomPage extends SpecialPage {
 	}
 
 	public function execute( $par ) {
-		global $wgOut, $wgContLang;
+		global $wgOut, $wgContLang, $wgRequest;
 
 		if ($par) {
 			$this->setNamespace( $wgContLang->getNsIndex( $par ) );
@@ -48,7 +68,9 @@ class RandomPage extends SpecialPage {
 			return;
 		}
 
-		$query = $this->isRedirect() ? 'redirect=no' : '';
+		$redirectParam = $this->isRedirect() ? array( 'redirect' => 'no' ) : array();
+		$query = array_merge( $wgRequest->getValues(), $redirectParam );
+		unset( $query['title'] );
 		$wgOut->redirect( $title->getFullUrl( $query ) );
 	}