'wp-includes/js/jquery/ui/jquery.ui.tabs.min.js',
'wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js',
'wp-includes/js/jquery/ui/jquery.ui.widget.min.js',
-'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png',
+'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png'
);
/**
// Import $wp_version, $required_php_version, and $required_mysql_version from the new version
// $wp_filesystem->wp_content_dir() returned unslashed pre-2.8
+ global $wp_version, $required_php_version, $required_mysql_version;
+
$versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php';
if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
$wp_filesystem->delete( $from, true );
$php_version = phpversion();
$mysql_version = $wpdb->db_version();
- $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from
+ $old_wp_version = $wp_version; // The version of WordPress we're updating from
$development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // a dash in the version indicates a Development release
$php_compat = version_compare( $php_version, $required_php_version, '>=' );
if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )