From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Dec 2011 13:29:22 +0100 Subject: Update to MediaWiki 1.18.0 * also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing --- includes/templates/PHP4.php | 102 --------------------------------------- includes/templates/Userlogin.php | 48 +++++++++++------- 2 files changed, 30 insertions(+), 120 deletions(-) delete mode 100644 includes/templates/PHP4.php (limited to 'includes/templates') diff --git a/includes/templates/PHP4.php b/includes/templates/PHP4.php deleted file mode 100644 index 69f7d55d..00000000 --- a/includes/templates/PHP4.php +++ /dev/null @@ -1,102 +0,0 @@ - - - - - MediaWiki <?php echo htmlspecialchars( $wgVersion ); ?> - - - - - The MediaWiki logo - -

MediaWiki

-
-

- MediaWiki requires PHP 5.1.x or higher. You are running PHP - . -

-You may be able to use MediaWiki using a .php5 file extension.

"; - $downloadOther = false; - } -} -if ( $downloadOther ) { -?> -

Please consider -upgrading your copy of PHP. -PHP 4 is at the end of its lifecycle and will not receive further security updates.

-

If for some reason you really really need to run MediaWiki on PHP 4, you will need to -download version 1.6.x -from our website.

- - -
- - diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php index 99ab2d8e..0bfd9737 100644 --- a/includes/templates/Userlogin.php +++ b/includes/templates/Userlogin.php @@ -36,7 +36,7 @@ class UserloginTemplate extends QuickTemplate { html('header'); /* pre-table point for form plugins... */ ?>
msgWiki('loginprompt') ?>
- haveData( 'languages' ) ) { ?> + haveData( 'languages' ) ) { ?> @@ -130,21 +130,29 @@ class UserloginTemplate extends QuickTemplate { 'tabindex' => '9' ) ); if ( $this->data['useemail'] && $this->data['canreset'] ) { - echo ' '; - echo Html::input( 'wpMailmypassword', wfMsg( 'mailmypassword' ), 'submit', array( - 'id' => 'wpMailmypassword', - 'tabindex' => '10' - ) ); + if( $this->data['resetlink'] === true ){ + echo ' '; + echo Linker::link( + SpecialPage::getTitleFor( 'PasswordReset' ), + wfMessage( 'userlogin-resetlink' ) + ); + } elseif( $this->data['resetlink'] === null ) { + echo ' '; + echo Html::input( 'wpMailmypassword', wfMsg( 'mailmypassword' ), 'submit', array( + 'id' => 'wpMailmypassword', + 'tabindex' => '10' + ) ); + } } ?>
-haveData( 'uselang' ) ) { ?> -haveData( 'token' ) ) { ?> +haveData( 'uselang' ) ) { ?> +haveData( 'token' ) ) { ?> -
msgWiki( 'loginend' ); ?>
+
html( 'loginend' ); ?>
msg('createaccount') ?> html('header'); /* pre-table point for form plugins... */ ?> - haveData( 'languages' ) ) { ?> + haveData( 'languages' ) ) { ?> @@ -251,11 +259,15 @@ class UsercreateTemplate extends QuickTemplate { 'size' => '20' ) ); ?>
- data['emailrequired'] ) { - $this->msgWiki('prefs-help-email-required'); - } else { - $this->msgWiki('prefs-help-email'); - } ?> + data['emailrequired'] ) { + $this->msgWiki('prefs-help-email-required'); + } else { + $this->msgWiki('prefs-help-email'); + } + if( $this->data['emailothers'] ) { + $this->msgWiki('prefs-help-email-others'); + } ?>
@@ -361,11 +373,11 @@ class UsercreateTemplate extends QuickTemplate {
-haveData( 'uselang' ) ) { ?> -haveData( 'token' ) ) { ?> +haveData( 'uselang' ) ) { ?> +haveData( 'token' ) ) { ?> -
msgWiki( 'signupend' ); ?>
+
html( 'signupend' ); ?>