Only upgrade if we are installed. Fixes #7627 props pishmishy.
git-svn-id: https://develop.svn.wordpress.org/trunk@8763 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
297183391d
commit
832b0dd21a
@ -141,6 +141,9 @@ function wp_upgrade() {
|
|||||||
if ( $wp_db_version == $wp_current_db_version )
|
if ( $wp_db_version == $wp_current_db_version )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if(!is_blog_installed())
|
||||||
|
return;
|
||||||
|
|
||||||
wp_check_mysql_version();
|
wp_check_mysql_version();
|
||||||
wp_cache_flush();
|
wp_cache_flush();
|
||||||
make_db_current_silent();
|
make_db_current_silent();
|
||||||
|
@ -45,7 +45,7 @@ $step = (int) $step;
|
|||||||
<body>
|
<body>
|
||||||
<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
|
<h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
|
||||||
|
|
||||||
<?php if ( get_option('db_version') == $wp_db_version ) : ?>
|
<?php if ( get_option('db_version') == $wp_db_version || !is_blog_installed()) : ?>
|
||||||
|
|
||||||
<h2><?php _e('No Upgrade Required'); ?></h2>
|
<h2><?php _e('No Upgrade Required'); ?></h2>
|
||||||
<p><?php _e('Your WordPress database is already up-to-date!'); ?></p>
|
<p><?php _e('Your WordPress database is already up-to-date!'); ?></p>
|
||||||
@ -92,4 +92,4 @@ endswitch;
|
|||||||
endif;
|
endif;
|
||||||
?>
|
?>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
Loading…
Reference in New Issue
Block a user