From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Sat, 6 Dec 2014 10:27:04 +0000 (+0100)
Subject: Escape word-separator in LogFormatter
X-Git-Tag: 1.31.0-rc.0~12845
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=5e969b82d15003af52c32ca1686a64bf37bca27b;p=lhc%2Fweb%2Fwiklou.git

Escape word-separator in LogFormatter

Change-Id: I9428f5ff5b95d09932b3588f0118d6992a384390
---

diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index 464b723f71..c6fcdb0d4a 100644
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -355,8 +355,10 @@ class LogFormatter {
 				$element = $this->styleRestricedElement( $element );
 			}
 		} else {
-			$performer = $this->getPerformerElement() . $this->msg( 'word-separator' )->text();
-			$element = $performer . $this->getRestrictedElement( 'rev-deleted-event' );
+			$sep = $this->msg( 'word-separator' );
+			$sep = $this->plaintext ? $sep->text() : $sep->escaped();
+			$performer = $this->getPerformerElement();
+			$element = $performer . $sep . $this->getRestrictedElement( 'rev-deleted-event' );
 		}
 
 		return $element;
@@ -731,7 +733,9 @@ class LegacyLogFormatter extends LogFormatter {
 
 		$performer = $this->getPerformerElement();
 		if ( !$this->irctext ) {
-			$action = $performer . $this->msg( 'word-separator' )->text() . $action;
+			$sep = $this->msg( 'word-separator' );
+			$sep = $this->plaintext ? $sep->text() : $sep->escaped();
+			$action = $performer . $sep . $action;
 		}
 
 		return $action;