From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 22 Jun 2011 11:28:20 +0200 Subject: update to MediaWiki 1.17.0 --- includes/templates/NoLocalSettings.php | 48 +++++++++----------- includes/templates/PHP4.php | 6 ++- includes/templates/Userlogin.php | 81 +++++++++++++++++++++++++++------- 3 files changed, 89 insertions(+), 46 deletions(-) (limited to 'includes/templates') diff --git a/includes/templates/NoLocalSettings.php b/includes/templates/NoLocalSettings.php index 45b758a9..9001e3ba 100644 --- a/includes/templates/NoLocalSettings.php +++ b/includes/templates/NoLocalSettings.php @@ -1,5 +1,7 @@ @@ -57,13 +48,16 @@ foreach( $topdirs as $dir ){

MediaWiki

+

LocalSettings.php not found.

+

config/LocalSettings.php to the parent directory.' ); + if ( $installerStarted ) { + echo( "Please complete the installation and download LocalSettings.php." ); } else { - echo( "Please set up the wiki first." ); + echo( "Please set up the wiki first." ); } ?> +

diff --git a/includes/templates/PHP4.php b/includes/templates/PHP4.php index b071ebd5..69f7d55d 100644 --- a/includes/templates/PHP4.php +++ b/includes/templates/PHP4.php @@ -1,5 +1,7 @@ MediaWiki

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

- data['usedomain'] ) { + data['usedomain'] ) && $this->data['usedomain'] ) { $doms = ""; foreach( $this->data['domainnames'] as $dom ) { $doms .= ""; @@ -77,17 +83,41 @@ class UserloginTemplate extends QuickTemplate { haveData( 'extrafields' ) ) { + echo $this->data['extrafields']; + } + if( $this->data['canremember'] ) { ?> '4', - 'id' => 'wpRemember' - ) + ( $this->data['remember'] ? array( 'checked' ) : array() ) ); ?> - - + global $wgCookieExpiration, $wgLang; + echo Xml::checkLabel( + wfMsgExt( 'remembermypassword', 'parsemag', $wgLang->formatNum( ceil( $wgCookieExpiration / ( 3600 * 24 ) ) ) ), + 'wpRemember', + 'wpRemember', + $this->data['remember'], + array( 'tabindex' => '8' ) + ) + ?> + + + +data['cansecurelogin'] ) { ?> + + + + data['stickHTTPS'], + array( 'tabindex' => '9' ) + ); + ?> @@ -97,13 +127,13 @@ class UserloginTemplate extends QuickTemplate { 'wpLoginAttempt', - 'tabindex' => '5' + 'tabindex' => '9' ) ); if ( $this->data['useemail'] && $this->data['canreset'] ) { - echo ' '; + echo ' '; echo Html::input( 'wpMailmypassword', wfMsg( 'mailmypassword' ), 'submit', array( 'id' => 'wpMailmypassword', - 'tabindex' => '6' + 'tabindex' => '10' ) ); } ?> @@ -145,6 +175,8 @@ class UsercreateTemplate extends QuickTemplate {
+ +
msgWiki( 'signupstart' ); ?>
@@ -240,21 +272,36 @@ class UsercreateTemplate extends QuickTemplate {
+ data['usereason'] ) { ?> + + + + + + + data['canremember'] ) { ?> - data['remember'] ) { ?>checked="checked" - /> + formatNum( ceil( $wgCookieExpiration / ( 3600 * 24 ) ) ) ), + 'wpRemember', + 'wpRemember', + $this->data['remember'], + array( 'tabindex' => '8' ) + ) + ?> data['extraInput'] ) && is_array( $this->data['extraInput'] ) ) { foreach ( $this->data['extraInput'] as $inputItem ) { ?> -- cgit v1.2.2