diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/install.php --- a/wp/wp-admin/install.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-admin/install.php Mon Oct 14 17:39:30 2019 +0200 @@ -16,8 +16,8 @@ Error: PHP is not running -

WordPress

-

Error: PHP is not running

+ +

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.

@@ -49,9 +49,11 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; /** - * Display install header. + * Display installation header. * * @since 2.5.0 + * + * @param string $body_classes */ function display_header( $body_classes = '' ) { header( 'Content-Type: text/html; charset=utf-8' ); @@ -67,13 +69,15 @@ + <?php _e( 'WordPress › Installation' ); ?> -

+ +

@@ -124,30 +133,78 @@ - + - -

+ - -

-
-

+
+ + + +
+
+

+ + +

+ + + + + + + + + + + + + + - +

- - + + +
+ + + /> +
+ /> + +

+ + +

+ +
+ -

+

'submit' ) ); ?>

' . __( 'Already Installed' ) . '

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

' . __( 'Log In' ) . '

' ); + die( + '

' . __( 'Already Installed' ) . '

' . + '

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

' . + '

' . __( 'Log In' ) . '

' . + '' + ); } +/** + * @global string $wp_version + * @global string $required_php_version + * @global string $required_mysql_version + * @global wpdb $wpdb + */ global $wp_version, $required_php_version, $required_mysql_version; $php_version = phpversion(); @@ -166,12 +234,16 @@ $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 ) +if ( !$mysql_compat && !$php_compat ) { + /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */ $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 ) +} elseif ( !$php_compat ) { + /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */ $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 ) +} elseif ( !$mysql_compat ) { + /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */ $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(); @@ -180,20 +252,46 @@ if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) { display_header(); - die( '

' . __( 'Configuration Error' ) . '

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

' ); + die( + '

' . __( 'Configuration Error' ) . '

' . + '

' . sprintf( + /* translators: %s: wp-config.php */ + __( 'Your %s file has an empty database table prefix, which is not supported.' ), + 'wp-config.php' + ) . '

' + ); } +// Set error message if DO_NOT_UPGRADE_GLOBAL_TABLES isn't set as it will break install. +if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { + display_header(); + die( + '

' . __( 'Configuration Error' ) . '

' . + '

' . sprintf( + /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */ + __( 'The constant %s cannot be defined when installing WordPress.' ), + 'DO_NOT_UPGRADE_GLOBAL_TABLES' + ) . '

' + ); +} + +/** + * @global string $wp_local_package + * @global WP_Locale $wp_locale + */ $language = ''; if ( ! empty( $_REQUEST['language'] ) ) { - $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] ); + $language = preg_replace( '/[^a-zA-Z0-9_]/', '', $_REQUEST['language'] ); } elseif ( isset( $GLOBALS['wp_local_package'] ) ) { $language = $GLOBALS['wp_local_package']; } +$scripts_to_print = array( 'jquery' ); + switch($step) { case 0: // Step 0 - if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) { + $scripts_to_print[] = 'language-chooser'; display_header( 'language-chooser' ); echo '
'; wp_install_language_form( $languages ); @@ -212,12 +310,14 @@ } } + $scripts_to_print[] = 'user-profile'; + display_header(); ?>

-

+

error ) ) wp_die( $wpdb->error->get_error_message() ); + $scripts_to_print[] = 'user-profile'; + display_header(); // Fill in the data we gathered $weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : ''; @@ -241,9 +343,9 @@ $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; + $public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 1; - // Check e-mail address. + // Check email address. $error = false; if ( empty( $user_name ) ) { // TODO: poka-yoke @@ -273,7 +375,7 @@

-

+

@@ -291,17 +393,25 @@
-

+

+ +if ( ! wp_is_mobile() ) { + ?> - - - + +