Wow. Messy. Follow-up r112426, r112424: Fix incorrect calls. Should have been escaped...

diff --git a/includes/Linker.php b/includes/Linker.php
index fb23d7b..8bea052 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1399,7 +1399,7 @@ class Linker {
                        return '';
                } else {
                        $formatted = self::formatComment( $comment, $title, $local );
-                       $formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escape();
+                       $formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escaped();
                        return " <span class=\"comment\">$formatted</span>";
                }
        }
@@ -1441,7 +1441,7 @@ class Linker {
                } else {
                        global $wgLang;
                        $stxt = wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $size ) );
-                       $stxt = wfMessage( 'parentheses' )->rawParams( $stxt )->escape();
+                       $stxt = wfMessage( 'parentheses' )->rawParams( $stxt )->escaped();
                }
                $stxt = htmlspecialchars( $stxt );
                return "<span class=\"history-size\">$stxt</span>";
@@ -1870,7 +1870,7 @@ class Linker {
                $html = $delete ? wfMsgHtml( 'rev-delundel' ) : wfMsgHtml( 'rev-showdeleted' );
                $tag = $restricted ? 'strong' : 'span';
                $link = self::link( $sp, $html, array(), $query, array( 'known', 'noclasses' ) );
-               return Xml::tags( $tag, array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $link )->escape() );
+               return Xml::tags( $tag, array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $link )->escaped() );
        }
 
        /**
@@ -1883,7 +1883,7 @@ class Linker {
         */
        public static function revDeleteLinkDisabled( $delete = true ) {
                $html = $delete ? wfMsgHtml( 'rev-delundel' ) : wfMsgHtml( 'rev-showdeleted' );
-               return Xml::tags( 'span', array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $html )->escape() );
+               return Xml::tags( 'span', array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $html )->escaped() );
        }
 
        /* Deprecated methods */

diff --git a/includes/Pager.php b/includes/Pager.php
index 2673205..86b7729 100644 (file)
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -771,7 +771,7 @@ abstract class ReverseChronologicalPager extends IndexPager {
                $limits = $this->getLanguage()->pipeList( $limitLinks );
                $firstLastLinks = wfMessage( 'parentheses' )->rawParams( "{$pagingLinks['first']}" .
                        wfMsgExt( 'pipe-separator' , 'escapenoentities' ) .
-                       "{$pagingLinks['last']}" )->escape();
+                       "{$pagingLinks['last']}" )->escaped();
 
                $this->mNavigationBar = $firstLastLinks . ' ' .
                        wfMsgHTML(

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 7d55ce2..57c0a26 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -254,7 +254,7 @@ class SpecialContributions extends SpecialPage {
                // @todo Should this be removed at some point?
                $oldMsg = $this->msg( 'contribsub' );
                if ( $oldMsg->exists() ) {
-                       $linksWithParentheses = $this->msg( 'parenteses' )->rawParams( $links )->escape();
+                       $linksWithParentheses = $this->msg( 'parenteses' )->rawParams( $links )->escaped();
                        return $oldMsg->rawParams( "$user $linksWithParentheses" );
                } else {
                        return $this->msg( 'contribsub2' )->rawParams( $user, $links );
@@ -839,7 +839,7 @@ class ContribsPager extends ReverseChronologicalPager {
                        $del .= ' ';
                }
 
-               $diffHistLinks = $this->msg( 'parentheses' )->rawParams( $difftext . $this->messages['pipe-separator'] . $histlink )->escape();
+               $diffHistLinks = $this->msg( 'parentheses' )->rawParams( $difftext . $this->messages['pipe-separator'] . $histlink )->escaped();
                $ret = "{$del}{$d} {$diffHistLinks}{$chardiff}{$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}";
 
                # Denote if username is redacted for this edit