X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4713a14935b83517997f3c88f808eb41da55033d..88550bc3400cc7c035ff590ecb007c7938041ded:/wp-admin/install.php
diff --git a/wp-admin/install.php b/wp-admin/install.php
index d29c8098..93c9d72f 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -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;
@@ -48,8 +53,14 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
*
* @since 2.5.0
*/
-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;
+ }
?>
>
@@ -61,8 +72,8 @@ function display_header() {
wp_admin_css( 'install', true );
?>
-
-
+
+
get_var("SHOW TABLES LIKE '$wpdb->users'") != null );
- // Ensure that Blogs appear in search engines by default
+ $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.
$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 ) ) {
?>
-
base_prefix ) || '' === $wpdb->base_prefix ) {
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' ); ?>
+
@@ -182,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() );
@@ -191,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
@@ -218,8 +266,7 @@ switch($step) {
if ( $error === false ) {
$wpdb->show_errors();
- $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ) );
- extract( $result, EXTR_SKIP );
+ $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
?>
@@ -234,9 +281,10 @@ switch($step) {
|
'. esc_html($password) .'
';
- echo "$password_message "; ?>
+ if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?>
+
+
+
|
@@ -252,5 +300,6 @@ if ( !wp_is_mobile() ) {
+