diff -r 346c88efed21 -r 5e2f62d02dcd wp/wp-admin/install.php --- a/wp/wp-admin/install.php Mon Jun 08 16:11:51 2015 +0000 +++ b/wp/wp-admin/install.php Tue Jun 09 03:35:32 2015 +0200 @@ -16,7 +16,7 @@ Error: PHP is not running -

WordPress

Error: PHP is not running

WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.

@@ -38,8 +38,13 @@ /** Load WordPress Administration Upgrade API */ require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); +/** Load WordPress Translation Install API */ +require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); + /** Load wpdb */ -require_once( ABSPATH . 'wp-includes/wp-db.php' ); +require_once( ABSPATH . WPINC . '/wp-db.php' ); + +nocache_headers(); $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; @@ -47,23 +52,28 @@ * Display install header. * * @since 2.5.0 - * @package WordPress - * @subpackage Installer */ -function display_header() { +function display_header( $body_classes = '' ) { header( 'Content-Type: text/html; charset=utf-8' ); + if ( is_rtl() ) { + $body_classes .= 'rtl'; + } + if ( $body_classes ) { + $body_classes = ' ' . $body_classes; + } ?> > + <?php _e( 'WordPress › Installation' ); ?> - -

+ +

get_var("SHOW TABLES LIKE '$wpdb->users'") != null ); + + $sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->users ) ); + $user_table = ( $wpdb->get_var( $sql ) != null ); - // Ensure that Blogs appear in search engines by default + // Ensure that Blogs appear in search engines by default. $blog_public = 1; - if ( ! empty( $_POST ) ) + if ( isset( $_POST['weblog_title'] ) ) { $blog_public = isset( $_POST['blog_public'] ); + } $weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : ''; $user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : ''; - $admin_password = isset($_POST['admin_password']) ? trim( wp_unslash( $_POST['admin_password'] ) ) : ''; $admin_email = isset( $_POST['admin_email'] ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : ''; if ( ! is_null( $error ) ) { ?>

+ @@ -105,9 +115,10 @@ '; } else { ?> -

@@ -115,28 +126,29 @@ - - - + +


- +	- +
	+
	/>	/>

- +

' . __( 'Already Installed' ) . '

' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '

' . __( 'Log In' ) . '

' ); } +global $wp_version, $required_php_version, $required_mysql_version; + $php_version = phpversion(); $mysql_version = $wpdb->db_version(); $php_compat = version_compare( $php_version, $required_php_version, '>=' ); $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' ); if ( !$mysql_compat && !$php_compat ) - $compat = sprintf( __( 'You cannot install because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ); + $compat = sprintf( __( 'You cannot install because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ); elseif ( !$php_compat ) - $compat = sprintf( __( 'You cannot install because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version ); + $compat = sprintf( __( 'You cannot install because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version ); elseif ( !$mysql_compat ) - $compat = sprintf( __( 'You cannot install because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version ); + $compat = sprintf( __( 'You cannot install because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version ); if ( !$mysql_compat || !$php_compat ) { display_header(); @@ -169,13 +183,39 @@ die( '

' . __( 'Configuration Error' ) . '

' . __( 'Your wp-config.php file has an empty database table prefix, which is not supported.' ) . '

' ); } +$language = ''; +if ( ! empty( $_REQUEST['language'] ) ) { + $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] ); +} elseif ( isset( $GLOBALS['wp_local_package'] ) ) { + $language = $GLOBALS['wp_local_package']; +} + switch($step) { - case 0: // Step 1 - case 1: // Step 1, direct link. - display_header(); + case 0: // Step 0 + + if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) { + display_header( 'language-chooser' ); + echo ''; + break; + } + + // Deliberately fall through if we can't reach the translations API. + + case 1: // Step 1, direct link or from language chooser. + if ( ! empty( $language ) ) { + $loaded_language = wp_download_language_pack( $language ); + if ( $loaded_language ) { + load_default_textdomain( $loaded_language ); + $GLOBALS['wp_locale'] = new WP_Locale(); + } + } + + display_header(); ?>

ReadMe documentation at your leisure. Otherwise, just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ), '../readme.html' ); ?>

@@ -184,6 +224,13 @@ display_setup_form(); break; case 2: + if ( ! empty( $language ) && load_default_textdomain( $language ) ) { + $loaded_language = $language; + $GLOBALS['wp_locale'] = new WP_Locale(); + } else { + $loaded_language = 'en_US'; + } + if ( ! empty( $wpdb->error ) ) wp_die( $wpdb->error->get_error_message() ); @@ -193,9 +240,10 @@ $user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : ''; $admin_password = isset($_POST['admin_password']) ? wp_unslash( $_POST['admin_password'] ) : ''; $admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : ''; - $admin_email = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : ''; - $public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0; - // check e-mail address + $admin_email = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : ''; + $public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0; + + // Check e-mail address. $error = false; if ( empty( $user_name ) ) { // TODO: poka-yoke @@ -208,7 +256,7 @@ // TODO: poka-yoke display_setup_form( __( 'Your passwords do not match. Please try again.' ) ); $error = true; - } else if ( empty( $admin_email ) ) { + } elseif ( empty( $admin_email ) ) { // TODO: poka-yoke display_setup_form( __( 'You must provide an email address.' ) ); $error = true; @@ -220,8 +268,7 @@ if ( $error === false ) { $wpdb->show_errors(); - $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', $admin_password); - extract( $result, EXTR_SKIP ); + $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language ); ?>

@@ -236,9 +283,10 @@ '. esc_html($password) .'
'; - echo "

$password_message

"; ?> + if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?> +
+ +

@@ -249,8 +297,11 @@ } break; } +if ( !wp_is_mobile() ) { ?> + +