Changeset 19060 for trunk/wp-admin/update-core.php

Timestamp:

10/25/2011 05:29:28 AM (15 years ago)

Author:

nacin

Message:

Introduce ->mysql to allow drop-ins to declare themselves as MySQL and therefore allow minimum version checks to still apply. fixes #18176.

File:

• trunk/wp-admin/update-core.php (modified) (1 diff)

trunk/wp-admin/update-core.php

@@ -45 +45 @@
                         $form_action = 'update-core.php?action=do-core-reinstall';
                 } else {
-                        $php_compat     = version_compare( $php_version, $update->php_version, '>=' );
-                        $mysql_compat   = version_compare( $mysql_version, $update->mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
+                        $php_compat     = version_compare( $php_version, $update->php_version, '>=' );                  
+                        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, '>=' );
+
                         if ( !$mysql_compat && !$php_compat )
                                 $message = sprintf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> 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.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );