r67082 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r67081‎ | r67082 | r67083 >
Date:15:55, 30 May 2010
Author:catrope
Status:ok
Tags:
Comment:
ContactPageFundraiser: Merge r67081 from 1.16wmf4 to trunk
Modified paths:
  • /trunk/extensions/ContactPageFundraiser (modified) (history)
  • /trunk/extensions/ContactPageFundraiser/ContactPage.php (modified) (history)
  • /trunk/extensions/ContactPageFundraiser/SpecialContact.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ContactPageFundraiser/SpecialContact.php
@@ -37,7 +37,7 @@
3838 function execute( $par ) {
3939 global $wgUser, $wgOut, $wgRequest, $wgEnableEmail, $wgContactUser;
4040
41 - wfLoadExtensionMessages( 'ContactPage' );
 41+ wfLoadExtensionMessages( 'ContactPageFundraiser' );
4242 $fname = "SpecialContact::execute";
4343
4444 if ( $wgRequest->wasPosted() ) {
Index: trunk/extensions/ContactPageFundraiser/ContactPage.php
@@ -25,8 +25,8 @@
2626 );
2727
2828 $dir = dirname(__FILE__) . '/';
29 -$wgExtensionMessagesFiles['ContactPage'] = $dir . 'ContactPage.i18n.php';
30 -$wgExtensionAliasesFiles['ContactPage'] = $dir . 'ContactPage.alias.php';
 29+$wgExtensionMessagesFiles['ContactPageFundraiser'] = $dir . 'ContactPage.i18n.php';
 30+$wgExtensionAliasesFiles['ContactPageFundraiser'] = $dir . 'ContactPage.alias.php';
3131
3232 $wgAutoloadClasses['SpecialContact'] = $dir . 'SpecialContact.php';
3333 $wgSpecialPages['Contact'] = 'SpecialContact';
Property changes on: trunk/extensions/ContactPageFundraiser
___________________________________________________________________
Name: svn:mergeinfo
3434 - /branches/REL1_15/phase3/extensions/ContactPageFundraiser:51646
/trunk/extensions/ContactPageFundraiser:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
/trunk/phase3/ContactPageFundraiser:52859,53272
/trunk/phase3/extensions/ContactPageFundraiser:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626
3535 + /branches/REL1_15/phase3/extensions/ContactPageFundraiser:51646
/branches/wmf/1.16wmf4/extensions/ContactPageFundraiser:67081
/trunk/extensions/ContactPageFundraiser:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
/trunk/phase3/ContactPageFundraiser:52859,53272
/trunk/phase3/extensions/ContactPageFundraiser:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r670811.16wmf4: Rename ContactPageFundraiser message group to reduce conflicts with...catrope15:42, 30 May 2010

Status & tagging log