sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

install.php whitespace cleanup, inline docs, function @sinces, fixes #11491

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@13124 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2010-02-13 20:40:42 +00:00
parent 9682c32c7b
commit 4ce1c841cb
1 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
wp-admin/install.php
View File

@ -9,7 +9,7 @@
/** /**
* We are installing WordPress. * We are installing WordPress.
* *
* @since unknown * @since 1.5.1
* @var bool * @var bool
*/ */
define( 'WP_INSTALLING', true ); define( 'WP_INSTALLING', true );
@ -20,15 +20,12 @@ require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
/** Load WordPress Administration Upgrade API */ /** Load WordPress Administration Upgrade API */
require_once( dirname( __FILE__ ) . '/includes/upgrade.php' ); require_once( dirname( __FILE__ ) . '/includes/upgrade.php' );
if (isset($_GET['step'])) $step = isset( $_GET['step'] ) ? $_GET['step'] : 0;
$step = $_GET['step'];
else
$step = 0;
/** /**
* Display install header. * Display install header.
* *
* @since unknown * @since 2.5.0
* @package WordPress * @package WordPress
* @subpackage Installer * @subpackage Installer
*/ */
@ -46,14 +43,20 @@ header( 'Content-Type: text/html; charset=utf-8' );
<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1> <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
<?php <?php
}//end function display_header(); } // end display_header()
/**
* Display installer setup form.
*
* @since 2.8.0
* @package WordPress
* @subpackage Installer
*/
function display_setup_form( $error = null ) { function display_setup_form( $error = null ) {
// Ensure that Blogs appear in search engines by default // Ensure that Blogs appear in search engines by default
$blog_public = 1; $blog_public = 1;
if ( isset($_POST) && !empty($_POST) ) { if ( isset( $_POST ) && ! empty( $_POST ) )
$blog_public = isset( $_POST['blog_public'] ); $blog_public = isset( $_POST['blog_public'] );
}
if ( ! is_null( $error ) ) { if ( ! is_null( $error ) ) {
?> ?>
@ -77,10 +80,13 @@ function display_setup_form( $error = null ) {
<p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p> <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p>
</form> </form>
<?php <?php
} } // end display_setup_form()
// Let's check to make sure WP isn't already installed. // Let's check to make sure WP isn't already installed.
if ( is_blog_installed() ) {display_header(); die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');} if ( is_blog_installed() ) {
display_header();
die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
}
$php_version = phpversion(); $php_version = phpversion();
$mysql_version = $wpdb->db_version(); $mysql_version = $wpdb->db_version();
@ -100,19 +106,16 @@ if ( !$mysql_compat || !$php_compat ) {
} }
switch($step) { switch($step) {
case 0: case 0: // Step 1
case 1: // in case people are directly linking to this case 1: // Step 1, direct link.
display_header(); display_header();
?> ?>
<h1><?php _e( 'Welcome' ); ?></h1> <h1><?php _e( 'Welcome' ); ?></h1>
<p><?php printf( __( 'Welcome to the famous five minute WordPress installation process! You may want to browse the <a href="%s">ReadMe documentation</a> at your leisure. Otherwise, just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ), '../readme.html' ); ?></p> <p><?php printf( __( 'Welcome to the famous five minute WordPress installation process! You may want to browse the <a href="%s">ReadMe documentation</a> at your leisure. Otherwise, just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ), '../readme.html' ); ?></p>
<!--<h2 class="step"><a href="install.php?step=1"><?php _e('First Step'); ?></a></h2>-->
<h1><?php _e( 'Information needed' ); ?></h1> <h1><?php _e( 'Information needed' ); ?></h1>
<p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p> <p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p>
<?php <?php
display_setup_form(); display_setup_form();
break; break;
@ -145,7 +148,7 @@ switch($step) {
<h1><?php _e( 'Success!' ); ?></h1> <h1><?php _e( 'Success!' ); ?></h1>
<p><?php printf(__('WordPress has been installed. Were you expecting more steps? Sorry to disappoint.'), ''); ?></p> <p><?php _e( 'WordPress has been installed. Were you expecting more steps? Sorry to disappoint.' ); ?></p>
<table class="form-table"> <table class="form-table">
<tr> <tr>
@ -154,10 +157,11 @@ switch($step) {
</tr> </tr>
<tr> <tr>
<th><?php _e( 'Password' ); ?></th> <th><?php _e( 'Password' ); ?></th>
<td><?php if ( !empty( $password ) ) { <td><?php
echo '<code>'. $password .'</code><br />'; if ( ! empty( $password ) )
} echo "<code>$password</code><br />";
echo '<p>'. $password_message .'</p>'; ?></td> echo "<p>$password_message</p>"; ?>
</td>
</tr> </tr>
</table> </table>