X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..88550bc3400cc7c035ff590ecb007c7938041ded:/wp-admin/install.php diff --git a/wp-admin/install.php b/wp-admin/install.php index 587d79ad..93c9d72f 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -16,7 +16,7 @@ if ( false ) {
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 @@ require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); /** 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,11 +52,15 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; * 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; + } ?> > @@ -63,8 +72,8 @@ function display_header() { wp_admin_css( 'install', true ); ?> - -' . __( 'Your wp-config.php
file has an empty database table prefix, which is not supported.' ) . '
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' ); ?>
+ @@ -185,6 +222,13 @@ switch($step) { 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() ); @@ -194,9 +238,10 @@ switch($step) { $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 @@ -221,8 +266,7 @@ switch($step) { 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 ); ?> @@ -237,9 +281,10 @@ switch($step) {$password_message
"; ?> + if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?> +