X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fef8173b8c3bad08f495551e43cfdeac1cae6021..refs/tags/wordpress-3.4.2-scripts:/wp-admin/upgrade.php
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index fc3698e4..6e5d3b81 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -27,7 +27,7 @@ if ( isset( $_GET['step'] ) )
else
$step = 0;
-// Do it. No output.
+// Do it. No output.
if ( 'upgrade_db' === $step ) {
wp_upgrade();
die( '0' );
@@ -38,11 +38,14 @@ $step = (int) $step;
$php_version = phpversion();
$mysql_version = $wpdb->db_version();
$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 ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+ $mysql_compat = true;
+else
+ $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
?>
-
+
>
@@ -53,7 +56,7 @@ $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>='
?>
-
+
@@ -85,8 +88,8 @@ switch ( $step ) :
case 1:
wp_upgrade();
- $backto = !empty($_GET['backto']) ? stripslashes( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
- $backto = esc_url_raw( $backto );
+ $backto = !empty($_GET['backto']) ? stripslashes( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
+ $backto = esc_url( $backto );
$backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
?>