diff options
| author | wushin <pasekei@gmail.com> | 2016-03-13 18:36:18 -0500 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2016-03-13 22:41:05 -0500 |
| commit | e6d7cdbad9c4a03055bcab20686a64d9a74fa95d (patch) | |
| tree | b75ea231b167a5f59e012b5273c9bcda3a4fc36e | |
| parent | 1a40c09c3b6a634c6d8fa2dae6df508af28f2af5 (diff) | |
| download | website-e6d7cdbad9c4a03055bcab20686a64d9a74fa95d.tar.gz website-e6d7cdbad9c4a03055bcab20686a64d9a74fa95d.tar.bz2 website-e6d7cdbad9c4a03055bcab20686a64d9a74fa95d.tar.xz website-e6d7cdbad9c4a03055bcab20686a64d9a74fa95d.zip | |
Update tmwa-wiki plugin
| -rw-r--r-- | extensions/tmwa/frontend/TMWAccountUI.hooks.php | 8 | ||||
| -rw-r--r-- | extensions/tmwa/frontend/TMWAccountUI.setup.php | 4 | ||||
| -rw-r--r-- | extensions/tmwa/frontend/registration.php | 2 | ||||
| -rw-r--r-- | extensions/tmwa/tmwa.php | 2 | ||||
| -rw-r--r-- | images/wiki_logo.png | bin | 9173 -> 9265 bytes |
5 files changed, 7 insertions, 9 deletions
diff --git a/extensions/tmwa/frontend/TMWAccountUI.hooks.php b/extensions/tmwa/frontend/TMWAccountUI.hooks.php index 0081a9a..16e8a55 100644 --- a/extensions/tmwa/frontend/TMWAccountUI.hooks.php +++ b/extensions/tmwa/frontend/TMWAccountUI.hooks.php @@ -11,7 +11,7 @@ class TMWAccountUIHooks { $context = RequestContext::getMain(); # Add a link to GameAccount from UserLogin if ( !$context->getUser()->isAllowed( 'createaccount' ) ) { - $template->set( 'header', wfMsgExt( 'gameaccount-loginnotice', 'parse' ) ); + $template->set( 'header', wfMessage( 'gameaccount-loginnotice')->parse()); } return true; } @@ -23,9 +23,9 @@ class TMWAccountUIHooks { */ public static function setRequestLoginLinks( array &$personal_urls, &$title ) { if ( isset( $personal_urls['anonlogin'] ) ) { - $personal_urls['anonlogin']['text'] = wfMsg( 'nav-login-createaccount' ); + $personal_urls['anonlogin']['text'] = wfMessage( 'nav-login-createaccount' ); } elseif ( isset( $personal_urls['login'] ) ) { - $personal_urls['login']['text'] = wfMsg( 'nav-login-createaccount' ); + $personal_urls['login']['text'] = wfMessage( 'nav-login-createaccount' ); } return true; } @@ -51,7 +51,7 @@ class TMWAccountUIHooks { if ( $count > 0 ) { $out->prependHtml( // parsemag for PLURAL '<div id="mw-tmwaccount-msg" class="plainlinks mw-tmwaccount-bar">' . - $out->parse( wfMsgExt( 'tmwaccount-newrequests', 'parsemag', $count ), false ) . + $out->parse( wfMessage( 'tmwaccount-newrequests', $count )->text(), false ) . '</div>' ); } diff --git a/extensions/tmwa/frontend/TMWAccountUI.setup.php b/extensions/tmwa/frontend/TMWAccountUI.setup.php index 9ff8800..73e4da5 100644 --- a/extensions/tmwa/frontend/TMWAccountUI.setup.php +++ b/extensions/tmwa/frontend/TMWAccountUI.setup.php @@ -26,10 +26,8 @@ class TMWAccountUISetup { * @param $groups Array $wgSpecialPageGroups (assoc array of special page groups) * @return void */ - public static function defineSpecialPages( array &$pages, array &$groups ) { + public static function defineSpecialPages( array &$pages ) { $pages['GameAccount'] = 'GameAccountPage'; - $groups['GameAccount'] = 'login'; $pages['GameNews'] = 'GameNewsPage'; - $groups['GameNews'] = 'changes'; } } diff --git a/extensions/tmwa/frontend/registration.php b/extensions/tmwa/frontend/registration.php index 52b71e0..47c1bd5 100644 --- a/extensions/tmwa/frontend/registration.php +++ b/extensions/tmwa/frontend/registration.php @@ -84,7 +84,7 @@ class GameAccountPage extends SpecialPage { global $wgCaptchaClass, $wgConfirmAccountCaptchas; if ($wgConfirmAccountCaptchas) { $captcha = new $wgCaptchaClass; - $form .= $captcha->getForm(); + $form .= $captcha->getForm($output); } $form .= '</td></tr><tr> <td colspan="2" style="text-align:right"> diff --git a/extensions/tmwa/tmwa.php b/extensions/tmwa/tmwa.php index 973b396..25c710f 100644 --- a/extensions/tmwa/tmwa.php +++ b/extensions/tmwa/tmwa.php @@ -18,7 +18,7 @@ require( dirname( __FILE__ ) . '/TMWAccount.setup.php' ); TMWAccountSetup::defineSourcePaths( $wgAutoloadClasses, $wgExtensionMessagesFiles ); # Actually register special pages -TMWAccountUISetup::defineSpecialPages( $wgSpecialPages, $wgSpecialPageGroups ); +TMWAccountUISetup::defineSpecialPages( $wgSpecialPages ); # UI-related hook handlers TMWAccountUISetup::defineHookHandlers( $wgHooks ); diff --git a/images/wiki_logo.png b/images/wiki_logo.png Binary files differindex 5b9f325..a7e68df 100644 --- a/images/wiki_logo.png +++ b/images/wiki_logo.png |
