https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112424

Revision: 112424
Author:   siebrand
Date:     2012-02-26 11:49:01 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
Follow-up r112410, r112412: Cheaper processing using plain().

Modified Paths:
--------------
    trunk/phase3/includes/Linker.php
    trunk/phase3/includes/Pager.php
    trunk/phase3/includes/specials/SpecialContributions.php

Modified: trunk/phase3/includes/Linker.php
===================================================================
--- trunk/phase3/includes/Linker.php    2012-02-26 11:39:49 UTC (rev 112423)
+++ trunk/phase3/includes/Linker.php    2012-02-26 11:49:01 UTC (rev 112424)
@@ -1399,7 +1399,7 @@
                        return '';
                } else {
                        $formatted = self::formatComment( $comment, $title, 
$local );
-                       $formatted = wfMessage( 'parentheses' )->rawParams( 
$formatted );
+                       $formatted = wfMessage( 'parentheses' )->rawParams( 
$formatted )->plain();
                        return " <span class=\"comment\">$formatted</span>";
                }
        }
@@ -1441,7 +1441,7 @@
                } else {
                        global $wgLang;
                        $stxt = wfMsgExt( 'nbytes', 'parsemag', 
$wgLang->formatNum( $size ) );
-                       $stxt = wfMessage( 'parentheses' )->rawParams( $stxt );
+                       $stxt = wfMessage( 'parentheses' )->rawParams( $stxt 
)->plain();
                }
                $stxt = htmlspecialchars( $stxt );
                return "<span class=\"history-size\">$stxt</span>";
@@ -1870,7 +1870,7 @@
                $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 ) );
+               return Xml::tags( $tag, array( 'class' => 'mw-revdelundel-link' 
), wfMessage( 'parentheses' )->rawParams( $link )->plain() );
        }
 
        /**
@@ -1883,7 +1883,7 @@
         */
        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 ) );
+               return Xml::tags( 'span', array( 'class' => 
'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $html 
)->plain() );
        }
 
        /* Deprecated methods */

Modified: trunk/phase3/includes/Pager.php
===================================================================
--- trunk/phase3/includes/Pager.php     2012-02-26 11:39:49 UTC (rev 112423)
+++ trunk/phase3/includes/Pager.php     2012-02-26 11:49:01 UTC (rev 112424)
@@ -771,7 +771,7 @@
                $limits = $this->getLanguage()->pipeList( $limitLinks );
                $firstLastLinks = wfMessage( 'parentheses' )->rawParams( 
"{$pagingLinks['first']}" .
                        wfMsgExt( 'pipe-separator' , 'escapenoentities' ) .
-                       "{$pagingLinks['last']}" );
+                       "{$pagingLinks['last']}" )->plain();
 
                $this->mNavigationBar = $firstLastLinks . ' ' .
                        wfMsgHTML(

Modified: trunk/phase3/includes/specials/SpecialContributions.php
===================================================================
--- trunk/phase3/includes/specials/SpecialContributions.php     2012-02-26 
11:39:49 UTC (rev 112423)
+++ trunk/phase3/includes/specials/SpecialContributions.php     2012-02-26 
11:49:01 UTC (rev 112424)
@@ -254,7 +254,7 @@
                // @todo Should this be removed at some point?
                $oldMsg = $this->msg( 'contribsub' );
                if ( $oldMsg->exists() ) {
-                       $linksWithParentheses = $this->msg( 'parenteses' 
)->rawParams( $links );
+                       $linksWithParentheses = $this->msg( 'parenteses' 
)->rawParams( $links )->plain();
                        return $oldMsg->rawParams( "$user 
$linksWithParentheses" );
                } else {
                        return $this->msg( 'contribsub2' )->rawParams( $user, 
$links );
@@ -839,7 +839,7 @@
                        $del .= ' ';
                }
 
-               $diffHistLinks = $this->msg( 'parentheses' )->rawParams( 
$difftext . $this->messages['pipe-separator'] . $histlink );
+               $diffHistLinks = $this->msg( 'parentheses' )->rawParams( 
$difftext . $this->messages['pipe-separator'] . $histlink )->plain();
                $ret = "{$del}{$d} {$diffHistLinks}{$chardiff}{$nflag}{$mflag} 
{$link}{$userlink} {$comment} {$topmarktext}";
 
                # Denote if username is redacted for this edit


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to