Wordpress 3.6

[autoinstalls/wordpress.git] / wp-admin / setup-config.php

diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 7409d010ffff3eeba4eef1e71eb04d2addfdd52b..82d06e99dc6ad959a6d40d8e87e8792e4dbe9015 100644 (file)
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -164,7 +164,7 @@ switch($step) {
 
        case 2:
        foreach ( array( 'dbname', 'uname', 'pwd', 'dbhost', 'prefix' ) as $key )
 
        case 2:
        foreach ( array( 'dbname', 'uname', 'pwd', 'dbhost', 'prefix' ) as $key )

-               $$key = trim( stripslashes( $_POST[ $key ] ) );
+               $$key = trim( wp_unslash( $_POST[ $key ] ) );

 
        $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
 
 
        $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
 


@@ -283,7 +283,7 @@ el.select();
                chmod(ABSPATH . 'wp-config.php', 0666);
                setup_config_display_header();
 ?>
                chmod(ABSPATH . 'wp-config.php', 0666);
                setup_config_display_header();
 ?>

-<p><?php _e( "All right sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;" ); ?></p>
+<p><?php _e( "All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;" ); ?></p>

 
 <p class="step"><a href="install.php" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
 <?php
 
 <p class="step"><a href="install.php" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
 <?php