From 5e969b82d15003af52c32ca1686a64bf37bca27b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Sat, 6 Dec 2014 11:27:04 +0100 Subject: [PATCH] Escape word-separator in LogFormatter Change-Id: I9428f5ff5b95d09932b3588f0118d6992a384390 --- includes/logging/LogFormatter.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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; -- 2.20.1