r104247 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r104246‎ | r104247 | r104248 >
Date:17:28, 25 November 2011
Author:johnduhart
Status:ok
Tags:
Comment:
msg function was overriding the new msg() function in SpecialPage, and is causing a fatal error in 1.19
Modified paths:
  • /trunk/extensions/ContributionReporting/ContributionHistory_body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ContributionReporting/ContributionHistory_body.php
@@ -65,14 +65,14 @@
6666 array(
6767 'href' => $title->getFullURL( 'offset=' . $newer ),
6868 ),
69 - $this->msg( 'contrib-hist-previous' )
 69+ $this->chMsg( 'contrib-hist-previous' )
7070 );
7171 }
7272 $pagingLinks[] = Xml::element( 'a',
7373 array(
7474 'href' => $title->getFullURL( 'offset=' . $older ),
7575 ),
76 - $this->msg( 'contrib-hist-next' )
 76+ $this->chMsg( 'contrib-hist-next' )
7777 );
7878 $pagingDiv = Xml::openElement( 'div',
7979 array( 'align' => 'right', 'style' => 'padding-bottom:20px' ) ) .
@@ -82,9 +82,9 @@
8383
8484 $output .= '<table style="width: 100%">';
8585 $output .= '<tr>';
86 - $output .= '<th width="60%">' . $this->msg( 'contrib-hist-name' ) . '</th>';
87 - $output .= '<th width="25%">' . $this->msg( 'contrib-hist-date' ) . '</th>';
88 - $output .= '<th width="15%" align="right">' . $this->msg( 'contrib-hist-amount' ) . '</th>';
 86+ $output .= '<th width="60%">' . $this->chMsg( 'contrib-hist-name' ) . '</th>';
 87+ $output .= '<th width="25%">' . $this->chMsg( 'contrib-hist-date' ) . '</th>';
 88+ $output .= '<th width="15%" align="right">' . $this->chMsg( 'contrib-hist-amount' ) . '</th>';
8989 $output .= '</tr>';
9090
9191 if ( $offset == null ) {
@@ -142,19 +142,19 @@
143143
144144 header( 'Cache-Control: max-age=300,s-maxage=300' );
145145 $wgOut->addWikiText( '{{2009/Donate-header/' . $language . '}}' );
146 - $wgOut->addHTML( '<h1>' . $this->msg( 'contrib-hist-header' ) . '</h1>' );
 146+ $wgOut->addHTML( '<h1>' . $this->chMsg( 'contrib-hist-header' ) . '</h1>' );
147147 $wgOut->addWikiText( '<strong>{{2008/Contribution history introduction/' . $language . '}}</strong>' );
148148 $wgOut->addHTML( $output );
149149 }
150150
151 - function msg( $key ) {
 151+ function chMsg( $key ) {
152152 return wfMsgExt( $key, array( 'escape', 'language' => $this->lang ) );
153153 }
154154
155155 function formatName( $row ) {
156156 $name = htmlspecialchars( $row['name'] );
157157 if( !$name ) {
158 - $name = $this->msg( 'contrib-hist-anonymous' );
 158+ $name = $this->chMsg( 'contrib-hist-anonymous' );
159159 }
160160 $name = '<strong>' . $name . '</strong>';
161161

Follow-up revisions

RevisionCommit summaryAuthorDate
r104586MFT r104062, r104247, r104248, r104362, r104370, r104372, r104424, r104425, r...awjrichards20:22, 29 November 2011

Status & tagging log