r112293 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r112292‎ | r112293 | r112294 >
Date:03:33, 24 February 2012
Author:tstarling
Status:ok
Tags:
Comment:
Fix conflict with SpecialPage::msg(), introduced in 1.19
Modified paths:
  • /trunk/extensions/ContributionTracking/ContributionTracking_body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ContributionTracking/ContributionTracking_body.php
@@ -79,7 +79,7 @@
8080 $repost = ContributionTrackingProcessor::getRepostFields( $params );
8181
8282 #$wgOut->addWikiText( "{{2009/Donate-banner/$language}}" );
83 - $wgOut->addHTML( $this->msgWiki( 'contrib-tracking-submitting' ) );
 83+ $wgOut->addHTML( $this->ct_msgWiki( 'contrib-tracking-submitting' ) );
8484
8585 // Output the repost form
8686 $output = '<form method="post" name="contributiontracking" action="' . $repost['action'] . '">';
@@ -88,12 +88,12 @@
8989 $output .= '<input type="hidden" name="' . htmlspecialchars( $key ) . '" value="' . htmlspecialchars( $value ) . '" />';
9090 }
9191
92 - $output .= $this->msgWiki( 'contrib-tracking-redirect' );
 92+ $output .= $this->ct_msgWiki( 'contrib-tracking-redirect' );
9393
9494 // Offer a button to post the form if the user has no Javascript support
9595 $output .= '<noscript>';
96 - $output .= $this->msgWiki( 'contrib-tracking-continue' );
97 - $output .= '<input type="submit" value="' . $this->msg( 'contrib-tracking-button' ) . '" />';
 96+ $output .= $this->ct_msgWiki( 'contrib-tracking-continue' );
 97+ $output .= '<input type="submit" value="' . $this->ct_msg( 'contrib-tracking-button' ) . '" />';
9898 $output .= '</noscript>';
9999
100100 $output .= '</form>';
@@ -104,11 +104,11 @@
105105 $wgOut->addHTML( '<script type="text/javascript">document.contributiontracking.submit();</script>' );
106106 }
107107
108 - function msg() {
 108+ function ct_msg() {
109109 return wfMsgExt( func_get_arg( 0 ), array( 'escape', 'language' => $this->lang ) );
110110 }
111111
112 - function msgWiki( $key ) {
 112+ function ct_msgWiki( $key ) {
113113 return wfMsgExt( $key, array( 'parse', 'language' => $this->lang ) );
114114 }
115115

Follow-up revisions

RevisionCommit summaryAuthorDate
r112294MFT r112293: 1.19 compattstarling03:37, 24 February 2012

Status & tagging log