Flush the cache for upgrades. Flesh out __get_option().
git-svn-id: https://develop.svn.wordpress.org/trunk@3129 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
673db4570a
commit
95cf1eb670
@ -414,6 +414,12 @@ function __get_option($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);
|
||||
if ($kellogs !== FALSE)
|
||||
return $kellogs;
|
||||
|
@ -74,8 +74,10 @@ switch($step) {
|
||||
break;
|
||||
|
||||
case 1:
|
||||
wp_cache_flush();
|
||||
make_db_current_silent();
|
||||
upgrade_all();
|
||||
wp_cache_flush();
|
||||
?>
|
||||
<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>
|
||||
|
Loading…
Reference in New Issue
Block a user