From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 27 Jun 2011 23:20:31 +0000 (+0000)
Subject: Don't put a quoted/regexed prefix back out again
X-Git-Tag: 1.31.0-rc.0~29238
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=c7e73376a9c8b2395d0075457a89c5c0961ea5c4;p=lhc%2Fweb%2Fwiklou.git

Don't put a quoted/regexed prefix back out again
---

diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php
index 77e85d7b5b..f457c9589b 100644
--- a/includes/specials/SpecialAllmessages.php
+++ b/includes/specials/SpecialAllmessages.php
@@ -88,7 +88,7 @@ class SpecialAllmessages extends SpecialPage {
  */
 class AllmessagesTablePager extends TablePager {
 
-	protected $filter, $prefix, $langcode;
+	protected $filter, $prefix, $langcode, $displayPrefix;
 
 	public $mLimitsShown;
 
@@ -132,8 +132,10 @@ class AllmessagesTablePager extends TablePager {
 		$prefix = $wgLang->ucfirst( $wgRequest->getVal( 'prefix', '' ) );
 		$prefix = $prefix != '' ? Title::makeTitleSafe( NS_MEDIAWIKI, $wgRequest->getVal( 'prefix', null ) ) : null;
 		if( $prefix !== null ){
-			$this->prefix = '/^' . preg_quote( $prefix->getDBkey() ) . '/i';
+			$this->displayPrefix = $prefix->getDBkey();
+			$this->prefix = '/^' . preg_quote( $this->displayPrefix ) . '/i';
 		} else {
+			$this->displayPrefix = false;
 			$this->prefix = false;
 		}
 		$this->getSkin();