Only upgrade if we are installed. Fixes #7627 props pishmishy.
git-svn-id: http://svn.automattic.com/wordpress/trunk@8763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
d0ac3df8f7
commit
be92ff6425
|
@ -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