From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 10 Feb 2009 13:04:18 +0000 (+0000)
Subject: Allow entities so that the "&#32;" in pipe-separator are not escaped twice
X-Git-Tag: 1.31.0-rc.0~42948
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=44f78fbb13376418d5752dcac5d4a27258fda385;p=lhc%2Fweb%2Fwiklou.git

Allow entities so that the "&#32;" in pipe-separator are not escaped twice
---

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index b32682947a..d2dc81bc1e 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -41,7 +41,7 @@ class LogEventsList {
 			$messages = array( 'revertmerge', 'protect_change', 'unblocklink', 'change-blocklink',
 				'revertmove', 'undeletelink', 'revdel-restore', 'rev-delundel', 'hist', 'pipe-separator' );
 			foreach( $messages as $msg ) {
-				$this->message[$msg] = wfMsgExt( $msg, array( 'escape' ) );
+				$this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
 			}
 		}
 	}
@@ -93,7 +93,7 @@ class LogEventsList {
 	}
 	
 	private function getFilterLinks( $logType, $filter ) {
-		global $wgTitle, $wgLang;
+		global $wgTitle;
 		// show/hide links
 		$messages = array( wfMsgHtml( 'show' ), wfMsgHtml( 'hide' ) );
 		// Option value -> message mapping
@@ -106,7 +106,7 @@ class LogEventsList {
 			$links[$type] = wfMsgHtml( "log-show-hide-{$type}", $link );
 		}
 		// Build links
-		return $wgLang->pipeList( $links );
+		return implode( ' | ', $links );
 	}
 	
 	private function getDefaultQuery() {