WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Flush the cache for upgrades. Flesh out __get_option(). 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-11-17 05:32:55 +00:00
parent bfd865984e
commit 6b01b6a07a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/upgrade-functions.php
View File

@ -414,6 +414,12 @@ function __get_option($setting) {
$option = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'"); $option = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
if ( 'home' == $setting && '' == $value )
return __get_option('siteurl');
if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
$option = preg_replace('|/+$|', '', $option);
@ $kellogs = unserialize($option); @ $kellogs = unserialize($option);
if ($kellogs !== FALSE) if ($kellogs !== FALSE)
return $kellogs; return $kellogs;

2
wp-admin/upgrade.php
View File

@ -74,8 +74,10 @@ switch($step) {
break; break;
case 1: case 1:
wp_cache_flush();
make_db_current_silent(); make_db_current_silent();
upgrade_all(); upgrade_all();
wp_cache_flush();
?> ?>
<h2><?php _e('Step 1'); ?></h2> <h2><?php _e('Step 1'); ?></h2>
<p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"), __get_option('home')); ?></p> <p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"), __get_option('home')); ?></p>