| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -1399,7 +1399,7 @@ |
| 1400 | 1400 | return ''; |
| 1401 | 1401 | } else { |
| 1402 | 1402 | $formatted = self::formatComment( $comment, $title, $local ); |
| 1403 | | - $formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->plain(); |
| | 1403 | + $formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escape(); |
| 1404 | 1404 | return " <span class=\"comment\">$formatted</span>"; |
| 1405 | 1405 | } |
| 1406 | 1406 | } |
| — | — | @@ -1441,7 +1441,7 @@ |
| 1442 | 1442 | } else { |
| 1443 | 1443 | global $wgLang; |
| 1444 | 1444 | $stxt = wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $size ) ); |
| 1445 | | - $stxt = wfMessage( 'parentheses' )->rawParams( $stxt )->plain(); |
| | 1445 | + $stxt = wfMessage( 'parentheses' )->rawParams( $stxt )->escape(); |
| 1446 | 1446 | } |
| 1447 | 1447 | $stxt = htmlspecialchars( $stxt ); |
| 1448 | 1448 | return "<span class=\"history-size\">$stxt</span>"; |
| — | — | @@ -1870,7 +1870,7 @@ |
| 1871 | 1871 | $html = $delete ? wfMsgHtml( 'rev-delundel' ) : wfMsgHtml( 'rev-showdeleted' ); |
| 1872 | 1872 | $tag = $restricted ? 'strong' : 'span'; |
| 1873 | 1873 | $link = self::link( $sp, $html, array(), $query, array( 'known', 'noclasses' ) ); |
| 1874 | | - return Xml::tags( $tag, array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $link )->plain() ); |
| | 1874 | + return Xml::tags( $tag, array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $link )->escape() ); |
| 1875 | 1875 | } |
| 1876 | 1876 | |
| 1877 | 1877 | /** |
| — | — | @@ -1883,7 +1883,7 @@ |
| 1884 | 1884 | */ |
| 1885 | 1885 | public static function revDeleteLinkDisabled( $delete = true ) { |
| 1886 | 1886 | $html = $delete ? wfMsgHtml( 'rev-delundel' ) : wfMsgHtml( 'rev-showdeleted' ); |
| 1887 | | - return Xml::tags( 'span', array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $html )->plain() ); |
| | 1887 | + return Xml::tags( 'span', array( 'class' => 'mw-revdelundel-link' ), wfMessage( 'parentheses' )->rawParams( $html )->escape() ); |
| 1888 | 1888 | } |
| 1889 | 1889 | |
| 1890 | 1890 | /* Deprecated methods */ |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -254,7 +254,7 @@ |
| 255 | 255 | // @todo Should this be removed at some point? |
| 256 | 256 | $oldMsg = $this->msg( 'contribsub' ); |
| 257 | 257 | if ( $oldMsg->exists() ) { |
| 258 | | - $linksWithParentheses = $this->msg( 'parenteses' )->rawParams( $links )->plain(); |
| | 258 | + $linksWithParentheses = $this->msg( 'parenteses' )->rawParams( $links )->escape(); |
| 259 | 259 | return $oldMsg->rawParams( "$user $linksWithParentheses" ); |
| 260 | 260 | } else { |
| 261 | 261 | return $this->msg( 'contribsub2' )->rawParams( $user, $links ); |
| — | — | @@ -839,7 +839,7 @@ |
| 840 | 840 | $del .= ' '; |
| 841 | 841 | } |
| 842 | 842 | |
| 843 | | - $diffHistLinks = $this->msg( 'parentheses' )->rawParams( $difftext . $this->messages['pipe-separator'] . $histlink )->plain(); |
| | 843 | + $diffHistLinks = $this->msg( 'parentheses' )->rawParams( $difftext . $this->messages['pipe-separator'] . $histlink )->escape(); |
| 844 | 844 | $ret = "{$del}{$d} {$diffHistLinks}{$chardiff}{$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}"; |
| 845 | 845 | |
| 846 | 846 | # Denote if username is redacted for this edit |
| Index: trunk/phase3/includes/Pager.php |
| — | — | @@ -771,7 +771,7 @@ |
| 772 | 772 | $limits = $this->getLanguage()->pipeList( $limitLinks ); |
| 773 | 773 | $firstLastLinks = wfMessage( 'parentheses' )->rawParams( "{$pagingLinks['first']}" . |
| 774 | 774 | wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . |
| 775 | | - "{$pagingLinks['last']}" )->plain(); |
| | 775 | + "{$pagingLinks['last']}" )->escape(); |
| 776 | 776 | |
| 777 | 777 | $this->mNavigationBar = $firstLastLinks . ' ' . |
| 778 | 778 | wfMsgHTML( |