393 'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js',

   393 'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js',

   394 'wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png',

   394 'wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png',

   395 'wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js',

   395 'wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js',

   396 // Don't delete, yet: 'wp-pass.php',

   396 // Don't delete, yet: 'wp-pass.php',

   397 // Don't delete, yet: 'wp-register.php',

   397 // Don't delete, yet: 'wp-register.php',

   398 );

   538 );

   399 

   539 

   400 /**

   540 /**

   401  * Stores new files in wp-content to copy

   541  * Stores new files in wp-content to copy

   402  *

   542  *

   417 global $_new_bundled_files;

   557 global $_new_bundled_files;

   418 

   558 

   419 $_new_bundled_files = array(

   559 $_new_bundled_files = array(

   420 'plugins/akismet/' => '2.0',

   560 'plugins/akismet/' => '2.0',

   421 'themes/twentyten/' => '3.0',

   561 'themes/twentyten/' => '3.0',

   423 );

   564 );

   424 

   565 

   425 /**

   566 /**

   426  * Upgrade the core of WordPress.

   567  * Upgrade the core of WordPress.

   427  *

   568  *

   471 function update_core($from, $to) {

   612 function update_core($from, $to) {

   472 	global $wp_filesystem, $_old_files, $_new_bundled_files, $wpdb;

   613 	global $wp_filesystem, $_old_files, $_new_bundled_files, $wpdb;

   473 

   614 

   474 	@set_time_limit( 300 );

   615 	@set_time_limit( 300 );

   475 

   616 

   476 	$php_version    = phpversion();

   643 	$php_version    = phpversion();

   477 	$mysql_version  = $wpdb->db_version();

   644 	$mysql_version  = $wpdb->db_version();

   481 	$php_compat     = version_compare( $php_version, $required_php_version, '>=' );

   647 	$php_compat     = version_compare( $php_version, $required_php_version, '>=' );

   482 	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )

   648 	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )

   483 		$mysql_compat = true;

   649 		$mysql_compat = true;

   484 	else

   650 	else

   485 		$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );

   651 		$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );

   491 		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 ) );

   657 		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 ) );

   492 	elseif ( !$php_compat )

   658 	elseif ( !$php_compat )

   493 		return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ) );

   659 		return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ) );

   494 	elseif ( !$mysql_compat )

   660 	elseif ( !$mysql_compat )

   495 		return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );

   661 		return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );

   511 

   662 

   512 	apply_filters('update_feedback', __('Installing the latest version…'));

   663 	apply_filters('update_feedback', __('Installing the latest version…'));

   513 

   664 

   514 	// Create maintenance file to signal that we are upgrading

   665 	// Create maintenance file to signal that we are upgrading

   515 	$maintenance_string = '<?php $upgrading = ' . time() . '; ?>';

   666 	$maintenance_string = '<?php $upgrading = ' . time() . '; ?>';

   540 		}

   691 		}

   541 	}

   692 	}

   542 

   693 

   543 	// Copy New bundled plugins & themes

   694 	// Copy New bundled plugins & themes

   544 	// This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue.

   695 	// This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue.

   545 	if ( !is_wp_error($result) && ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {

   697 	if ( !is_wp_error($result) && ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {

   547 		foreach ( (array) $_new_bundled_files as $file => $introduced_version ) {

   698 		foreach ( (array) $_new_bundled_files as $file => $introduced_version ) {

   550 				$directory = ('/' == $file[ strlen($file)-1 ]);

   701 				$directory = ('/' == $file[ strlen($file)-1 ]);

   551 				list($type, $filename) = explode('/', $file, 2);

   702 				list($type, $filename) = explode('/', $file, 2);

   552 

   703 

   553 				if ( 'plugins' == $type )

   704 				if ( 'plugins' == $type )

   554 					$dest = $wp_filesystem->wp_plugins_dir();

   705 					$dest = $wp_filesystem->wp_plugins_dir();

   556 					$dest = trailingslashit($wp_filesystem->wp_themes_dir()); // Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2

   707 					$dest = trailingslashit($wp_filesystem->wp_themes_dir()); // Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2

   557 				else

   708 				else

   558 					continue;

   709 					continue;

   559 

   710 

   560 				if ( ! $directory ) {

   711 				if ( ! $directory ) {

   562 						continue;

   713 						continue;

   563 

   714 

   564 					if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )

   715 					if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )

   565 						$result = new WP_Error('copy_failed', __('Could not copy file.'), $dest . $filename);

   716 						$result = new WP_Error('copy_failed', __('Could not copy file.'), $dest . $filename);

   566 				} else {

   717 				} else {

   568 						continue;

   719 						continue;

   569 

   720 

   570 					$wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);

   721 					$wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);

   571 					$_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);

   722 					$_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);

   572 					if ( is_wp_error($_result) ) //If a error occurs partway through this final step, keep the error flowing through, but keep process going.

   723 					if ( is_wp_error($_result) ) //If a error occurs partway through this final step, keep the error flowing through, but keep process going.

   678  *

   829  *

   679  */

   830  */

   680 function _redirect_to_about_wordpress( $new_version ) {

   831 function _redirect_to_about_wordpress( $new_version ) {

   681 	global $wp_version, $pagenow, $action;

   832 	global $wp_version, $pagenow, $action;

   682 

   833 

   684 		return;

   835 		return;

   685 

   836 

   686 	// Ensure we only run this on the update-core.php page. wp_update_core() could be called in other contexts.

   837 	// Ensure we only run this on the update-core.php page. wp_update_core() could be called in other contexts.

   687 	if ( 'update-core.php' != $pagenow )

   838 	if ( 'update-core.php' != $pagenow )

   688 		return;

   839 		return;

   694 	load_default_textdomain();

   845 	load_default_textdomain();

   695 

   846 

   696 	// See do_core_upgrade()

   847 	// See do_core_upgrade()

   697 	show_message( __('WordPress updated successfully') );

   848 	show_message( __('WordPress updated successfully') );

   698 

   849 

   702 	// self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional.

   850 	// self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional.

   704 	show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, 'about.php?updated' ) . '</span>' );

   852 	show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, 'about.php?updated' ) . '</span>' );

   705 	echo '</div>';

   853 	echo '</div>';

   706 	?>

   854 	?>

   707 <script type="text/javascript">

   855 <script type="text/javascript">

   708 window.location = 'about.php?updated';

   856 window.location = 'about.php?updated';