--- a/wp/wp-admin/setup-config.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/setup-config.php Mon Oct 14 18:28:13 2019 +0200
@@ -12,19 +12,19 @@
/**
* We are installing.
*/
-define('WP_INSTALLING', true);
+define( 'WP_INSTALLING', true );
/**
* We are blissfully unaware of anything.
*/
-define('WP_SETUP_CONFIG', true);
+define( 'WP_SETUP_CONFIG', true );
/**
* Disable error reporting
*
* Set this to error_reporting( -1 ) for debugging
*/
-error_reporting(0);
+error_reporting( 0 );
if ( ! defined( 'ABSPATH' ) ) {
define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
@@ -46,17 +46,20 @@
} elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) ) {
$config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
} else {
- wp_die( sprintf(
- /* translators: %s: wp-config-sample.php */
- __( 'Sorry, I need a %s file to work from. Please re-upload this file to your WordPress installation.' ),
- '<code>wp-config-sample.php</code>'
- ) );
+ wp_die(
+ sprintf(
+ /* translators: %s: wp-config-sample.php */
+ __( 'Sorry, I need a %s file to work from. Please re-upload this file to your WordPress installation.' ),
+ '<code>wp-config-sample.php</code>'
+ )
+ );
}
// Check if wp-config.php has been created
if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
- wp_die( '<p>' . sprintf(
- /* translators: 1: wp-config.php 2: install.php */
+ wp_die(
+ '<p>' . sprintf(
+ /* translators: 1: wp-config.php, 2: install.php */
__( 'The file %1$s already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href="%2$s">installing now</a>.' ),
'<code>wp-config.php</code>',
'install.php'
@@ -66,8 +69,9 @@
// Check if wp-config.php exists above the root directory but is not part of another installation
if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
- wp_die( '<p>' . sprintf(
- /* translators: 1: wp-config.php 2: install.php */
+ wp_die(
+ '<p>' . sprintf(
+ /* translators: 1: wp-config.php, 2: install.php */
__( 'The file %1$s already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href="%2$s">installing now</a>.' ),
'<code>wp-config.php</code>',
'install.php'
@@ -89,16 +93,18 @@
* @param string|array $body_classes
*/
function setup_config_display_header( $body_classes = array() ) {
- $body_classes = (array) $body_classes;
+ $body_classes = (array) $body_classes;
$body_classes[] = 'wp-core-ui';
+ $dir_attr = '';
if ( is_rtl() ) {
$body_classes[] = 'rtl';
+ $dir_attr = ' dir="rtl"';
}
header( 'Content-Type: text/html; charset=utf-8' );
-?>
+ ?>
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php echo $dir_attr; ?>>
<head>
<meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -107,8 +113,8 @@
<?php wp_admin_css( 'install', true ); ?>
</head>
<body class="<?php echo implode( ' ', $body_classes ); ?>">
-<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
-<?php
+<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></p>
+ <?php
} // end function setup_config_display_header();
$language = '';
@@ -118,7 +124,7 @@
$language = $GLOBALS['wp_local_package'];
}
-switch($step) {
+switch ( $step ) {
case -1:
if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
setup_config_display_header( 'language-chooser' );
@@ -148,9 +154,9 @@
if ( ! empty( $loaded_language ) ) {
$step_1 .= '&language=' . $loaded_language;
}
-?>
-<h1 class="screen-reader-text"><?php _e( 'Before getting started' ) ?></h1>
-<p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
+ ?>
+<h1 class="screen-reader-text"><?php _e( 'Before getting started' ); ?></h1>
+<p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ); ?></p>
<ol>
<li><?php _e( 'Database name' ); ?></li>
<li><?php _e( 'Database username' ); ?></li>
@@ -158,226 +164,251 @@
<li><?php _e( 'Database host' ); ?></li>
<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
</ol>
-<p><?php
- /* translators: %s: wp-config.php */
- printf( __( 'We’re going to use this information to create a %s file.' ),
- '<code>wp-config.php</code>'
- );
- ?>
- <strong><?php
+<p>
+ <?php
+ /* translators: %s: wp-config.php */
+ printf(
+ __( 'We’re going to use this information to create a %s file.' ),
+ '<code>wp-config.php</code>'
+ );
+ ?>
+ <strong>
+ <?php
/* translators: 1: wp-config-sample.php, 2: wp-config.php */
- printf( __( 'If for any reason this automatic file creation doesn’t work, don’t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
+ printf(
+ __( 'If for any reason this automatic file creation doesn’t work, don’t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
'<code>wp-config-sample.php</code>',
'<code>wp-config.php</code>'
);
- ?></strong>
- <?php
- /* translators: %s: Codex URL */
- printf( __( 'Need more help? <a href="%s">We got it</a>.' ),
- __( 'https://codex.wordpress.org/Editing_wp-config.php' )
- );
-?></p>
+ ?>
+ </strong>
+ <?php
+ /* translators: %s: Codex URL */
+ printf(
+ __( 'Need more help? <a href="%s">We got it</a>.' ),
+ __( 'https://codex.wordpress.org/Editing_wp-config.php' )
+ );
+ ?>
+</p>
<p><?php _e( 'In all likelihood, these items were supplied to you by your Web Host. If you don’t have this information, then you will need to contact them before you can continue. If you’re all ready…' ); ?></p>
<p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let’s go!' ); ?></a></p>
-<?php
- break;
+ <?php
+ break;
case 1:
load_default_textdomain( $language );
$GLOBALS['wp_locale'] = new WP_Locale();
setup_config_display_header();
- ?>
-<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ) ?></h1>
+
+ $autofocus = wp_is_mobile() ? '' : ' autofocus';
+ ?>
+<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ); ?></h1>
<form method="post" action="setup-config.php?step=2">
<p><?php _e( 'Below you should enter your database connection details. If you’re not sure about these, contact your host.' ); ?></p>
- <table class="form-table">
+ <table class="form-table" role="presentation">
<tr>
<th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
- <td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
- <td><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
+ <td><input name="dbname" id="dbname" type="text" aria-describedby="dbname-desc" size="25" value="wordpress"<?php echo $autofocus; ?>/></td>
+ <td id="dbname-desc"><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
</tr>
<tr>
<th scope="row"><label for="uname"><?php _e( 'Username' ); ?></label></th>
- <td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
- <td><?php _e( 'Your database username.' ); ?></td>
+ <td><input name="uname" id="uname" type="text" aria-describedby="uname-desc" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
+ <td id="uname-desc"><?php _e( 'Your database username.' ); ?></td>
</tr>
<tr>
<th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
- <td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" autocomplete="off" /></td>
- <td><?php _e( 'Your database password.' ); ?></td>
+ <td><input name="pwd" id="pwd" type="text" aria-describedby="pwd-desc" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" autocomplete="off" /></td>
+ <td id="pwd-desc"><?php _e( 'Your database password.' ); ?></td>
</tr>
<tr>
<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
- <td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
- <td><?php
+ <td><input name="dbhost" id="dbhost" type="text" aria-describedby="dbhost-desc" size="25" value="localhost" /></td>
+ <td id="dbhost-desc">
+ <?php
/* translators: %s: localhost */
- printf( __( 'You should be able to get this info from your web host, if %s doesn’t work.' ),'<code>localhost</code>' );
- ?></td>
+ printf( __( 'You should be able to get this info from your web host, if %s doesn’t work.' ), '<code>localhost</code>' );
+ ?>
+ </td>
</tr>
<tr>
<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
- <td><input name="prefix" id="prefix" type="text" value="wp_" size="25" /></td>
- <td><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></td>
+ <td><input name="prefix" id="prefix" type="text" aria-describedby="prefix-desc" value="wp_" size="25" /></td>
+ <td id="prefix-desc"><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></td>
</tr>
</table>
- <?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
+ <?php
+ if ( isset( $_GET['noapi'] ) ) {
+ ?>
+<input name="noapi" type="hidden" value="1" /><?php } ?>
<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
</form>
-<?php
- break;
+ <?php
+ break;
case 2:
- load_default_textdomain( $language );
- $GLOBALS['wp_locale'] = new WP_Locale();
+ load_default_textdomain( $language );
+ $GLOBALS['wp_locale'] = new WP_Locale();
- $dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
- $uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
- $pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
- $dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
- $prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
-
- $step_1 = 'setup-config.php?step=1';
- $install = 'install.php';
- if ( isset( $_REQUEST['noapi'] ) ) {
- $step_1 .= '&noapi';
- }
+ $dbname = trim( wp_unslash( $_POST['dbname'] ) );
+ $uname = trim( wp_unslash( $_POST['uname'] ) );
+ $pwd = trim( wp_unslash( $_POST['pwd'] ) );
+ $dbhost = trim( wp_unslash( $_POST['dbhost'] ) );
+ $prefix = trim( wp_unslash( $_POST['prefix'] ) );
- if ( ! empty( $language ) ) {
- $step_1 .= '&language=' . $language;
- $install .= '?language=' . $language;
- } else {
- $install .= '?language=en_US';
- }
+ $step_1 = 'setup-config.php?step=1';
+ $install = 'install.php';
+ if ( isset( $_REQUEST['noapi'] ) ) {
+ $step_1 .= '&noapi';
+ }
- $tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
+ if ( ! empty( $language ) ) {
+ $step_1 .= '&language=' . $language;
+ $install .= '?language=' . $language;
+ } else {
+ $install .= '?language=en_US';
+ }
- if ( empty( $prefix ) )
- wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+ $tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
- // Validate $prefix: it can only contain letters, numbers and underscores.
- if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
- wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+ if ( empty( $prefix ) ) {
+ wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link );
+ }
- // Test the db connection.
- /**#@+
- * @ignore
- */
- define('DB_NAME', $dbname);
- define('DB_USER', $uname);
- define('DB_PASSWORD', $pwd);
- define('DB_HOST', $dbhost);
- /**#@-*/
+ // Validate $prefix: it can only contain letters, numbers and underscores.
+ if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
+ wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
+ }
- // Re-construct $wpdb with these new values.
- unset( $wpdb );
- require_wp_db();
-
- /*
- * The wpdb constructor bails when WP_SETUP_CONFIG is set, so we must
- * fire this manually. We'll fail here if the values are no good.
- */
- $wpdb->db_connect();
-
- if ( ! empty( $wpdb->error ) )
- wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+ // Test the db connection.
+ /**#@+
+ *
+ * @ignore
+ */
+ define( 'DB_NAME', $dbname );
+ define( 'DB_USER', $uname );
+ define( 'DB_PASSWORD', $pwd );
+ define( 'DB_HOST', $dbhost );
+ /**#@-*/
- $errors = $wpdb->hide_errors();
- $wpdb->query( "SELECT $prefix" );
- $wpdb->show_errors( $errors );
- if ( ! $wpdb->last_error ) {
- // MySQL was able to parse the prefix as a value, which we don't want. Bail.
- wp_die( __( '<strong>ERROR</strong>: "Table Prefix" is invalid.' ) );
- }
+ // Re-construct $wpdb with these new values.
+ unset( $wpdb );
+ require_wp_db();
+
+ /*
+ * The wpdb constructor bails when WP_SETUP_CONFIG is set, so we must
+ * fire this manually. We'll fail here if the values are no good.
+ */
+ $wpdb->db_connect();
- // Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
- try {
- $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
- $max = strlen($chars) - 1;
- for ( $i = 0; $i < 8; $i++ ) {
- $key = '';
- for ( $j = 0; $j < 64; $j++ ) {
- $key .= substr( $chars, random_int( 0, $max ), 1 );
- }
- $secret_keys[] = $key;
+ if ( ! empty( $wpdb->error ) ) {
+ wp_die( $wpdb->error->get_error_message() . $tryagain_link );
}
- } catch ( Exception $ex ) {
- $no_api = isset( $_POST['noapi'] );
- if ( ! $no_api ) {
- $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+ $errors = $wpdb->hide_errors();
+ $wpdb->query( "SELECT $prefix" );
+ $wpdb->show_errors( $errors );
+ if ( ! $wpdb->last_error ) {
+ // MySQL was able to parse the prefix as a value, which we don't want. Bail.
+ wp_die( __( '<strong>ERROR</strong>: "Table Prefix" is invalid.' ) );
}
- if ( $no_api || is_wp_error( $secret_keys ) ) {
- $secret_keys = array();
+ // Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
+ try {
+ $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
+ $max = strlen( $chars ) - 1;
for ( $i = 0; $i < 8; $i++ ) {
- $secret_keys[] = wp_generate_password( 64, true, true );
+ $key = '';
+ for ( $j = 0; $j < 64; $j++ ) {
+ $key .= substr( $chars, random_int( 0, $max ), 1 );
+ }
+ $secret_keys[] = $key;
}
- } else {
- $secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
- foreach ( $secret_keys as $k => $v ) {
- $secret_keys[$k] = substr( $v, 28, 64 );
+ } catch ( Exception $ex ) {
+ $no_api = isset( $_POST['noapi'] );
+
+ if ( ! $no_api ) {
+ $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
}
- }
- }
- $key = 0;
- foreach ( $config_file as $line_num => $line ) {
- if ( '$table_prefix =' == substr( $line, 0, 16 ) ) {
- $config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
- continue;
+ if ( $no_api || is_wp_error( $secret_keys ) ) {
+ $secret_keys = array();
+ for ( $i = 0; $i < 8; $i++ ) {
+ $secret_keys[] = wp_generate_password( 64, true, true );
+ }
+ } else {
+ $secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
+ foreach ( $secret_keys as $k => $v ) {
+ $secret_keys[ $k ] = substr( $v, 28, 64 );
+ }
+ }
}
- if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
- continue;
+ $key = 0;
+ foreach ( $config_file as $line_num => $line ) {
+ if ( '$table_prefix =' == substr( $line, 0, 15 ) ) {
+ $config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+ continue;
+ }
- $constant = $match[1];
- $padding = $match[2];
+ if ( ! preg_match( '/^define\(\s*\'([A-Z_]+)\',([ ]+)/', $line, $match ) ) {
+ continue;
+ }
+
+ $constant = $match[1];
+ $padding = $match[2];
- switch ( $constant ) {
- case 'DB_NAME' :
- case 'DB_USER' :
- case 'DB_PASSWORD' :
- case 'DB_HOST' :
- $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
- break;
- case 'DB_CHARSET' :
- if ( 'utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap( 'utf8mb4' ) ) ) {
- $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'utf8mb4');\r\n";
- }
- break;
- case 'AUTH_KEY' :
- case 'SECURE_AUTH_KEY' :
- case 'LOGGED_IN_KEY' :
- case 'NONCE_KEY' :
- case 'AUTH_SALT' :
- case 'SECURE_AUTH_SALT' :
- case 'LOGGED_IN_SALT' :
- case 'NONCE_SALT' :
- $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
- break;
+ switch ( $constant ) {
+ case 'DB_NAME':
+ case 'DB_USER':
+ case 'DB_PASSWORD':
+ case 'DB_HOST':
+ $config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "' );\r\n";
+ break;
+ case 'DB_CHARSET':
+ if ( 'utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap( 'utf8mb4' ) ) ) {
+ $config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'utf8mb4' );\r\n";
+ }
+ break;
+ case 'AUTH_KEY':
+ case 'SECURE_AUTH_KEY':
+ case 'LOGGED_IN_KEY':
+ case 'NONCE_KEY':
+ case 'AUTH_SALT':
+ case 'SECURE_AUTH_SALT':
+ case 'LOGGED_IN_SALT':
+ case 'NONCE_SALT':
+ $config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'" . $secret_keys[ $key++ ] . "' );\r\n";
+ break;
+ }
}
- }
- unset( $line );
+ unset( $line );
- if ( ! is_writable(ABSPATH) ) :
- setup_config_display_header();
-?>
-<p><?php
- /* translators: %s: wp-config.php */
- printf( __( 'Sorry, but I can’t write the %s file.' ), '<code>wp-config.php</code>' );
-?></p>
-<p><?php
- /* translators: %s: wp-config.php */
- printf( __( 'You can create the %s file manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
-?></p>
-<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
- foreach ( $config_file as $line ) {
- echo htmlentities($line, ENT_COMPAT, 'UTF-8');
- }
-?></textarea>
+ if ( ! is_writable( ABSPATH ) ) :
+ setup_config_display_header();
+ ?>
+ <p>
+ <?php
+ /* translators: %s: wp-config.php */
+ printf( __( 'Sorry, but I can’t write the %s file.' ), '<code>wp-config.php</code>' );
+ ?>
+</p>
+<p>
+ <?php
+ /* translators: %s: wp-config.php */
+ printf( __( 'You can create the %s file manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
+
+ $config_text = '';
+
+ foreach ( $config_file as $line ) {
+ $config_text .= htmlentities( $line, ENT_COMPAT, 'UTF-8' );
+ }
+ ?>
+</p>
+<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php echo $config_text; ?></textarea>
<p><?php _e( 'After you’ve done that, click “Run the installation.”' ); ?></p>
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
<script>
@@ -389,16 +420,17 @@
}
})();
</script>
-<?php
+ <?php
else :
/*
* If this file doesn't exist, then we are using the wp-config-sample.php
* file one level up, which is for the develop repo.
*/
- if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
+ if ( file_exists( ABSPATH . 'wp-config-sample.php' ) ) {
$path_to_wp_config = ABSPATH . 'wp-config.php';
- else
+ } else {
$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+ }
$handle = fopen( $path_to_wp_config, 'w' );
foreach ( $config_file as $line ) {
@@ -407,14 +439,14 @@
fclose( $handle );
chmod( $path_to_wp_config, 0666 );
setup_config_display_header();
-?>
-<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
+ ?>
+<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ); ?></h1>
<p><?php _e( 'All right, sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…' ); ?></p>
<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
-<?php
+ <?php
endif;
- break;
+ break;
}
?>
<?php wp_print_scripts( 'language-chooser' ); ?>