From 48d6975ae7022d4e5851b46d158adeb452013245 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Mon, 28 Dec 2009 17:19:04 +0000 Subject: [PATCH] Cleanup after bailing when php or mysql versions are not compat. Props nacin. fixes #11638 for trunk git-svn-id: https://develop.svn.wordpress.org/trunk@12564 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/update-core.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 5a2b275515..ffbbddbcf5 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -223,10 +223,13 @@ function update_core($from, $to) { $mysql_version = $wpdb->db_version(); $required_php_version = '4.3'; $required_mysql_version = '4.1.2'; - $wp_version = '2.9'; + $wp_version = '2.9.1'; $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 ) + $wp_filesystem->delete($from, true); + if ( !$mysql_compat && !$php_compat ) return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed 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 )