diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-11-21 09:24:59 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-11-21 09:24:59 +0000 |
| commit | ca9480281cb3cb331788f8475b1e080bff59ec8d (patch) | |
| tree | 03c3457f2c0be80543aec170ff2781087b532b62 /wp-inst/wp-admin/upgrade-functions.php | |
| parent | efcb857423cc3556d2283152cc1de82f6c56cc74 (diff) | |
| download | wordpress-mu-ca9480281cb3cb331788f8475b1e080bff59ec8d.tar.gz wordpress-mu-ca9480281cb3cb331788f8475b1e080bff59ec8d.tar.xz wordpress-mu-ca9480281cb3cb331788f8475b1e080bff59ec8d.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@442 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/upgrade-functions.php')
| -rw-r--r-- | wp-inst/wp-admin/upgrade-functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-inst/wp-admin/upgrade-functions.php b/wp-inst/wp-admin/upgrade-functions.php index 9c9f2e2..2c7bfb4 100644 --- a/wp-inst/wp-admin/upgrade-functions.php +++ b/wp-inst/wp-admin/upgrade-functions.php @@ -31,7 +31,7 @@ function upgrade_all() { upgrade_130(); } - if ( $wp_current_db_version < 3104 ) + if ( $wp_current_db_version < 3183 ) upgrade_160(); save_mod_rewrite_rules(); @@ -317,7 +317,7 @@ function upgrade_160() { $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments GROUP BY comment_post_ID" ); if( is_array( $comments ) ) { foreach ($comments as $comment) { - $wpdb->query( "UPDATE $wpdb->posts SET comment_count = $comment->c WHERE ID = '$comment->comment_post_ID}'" ); + $wpdb->query( "UPDATE $wpdb->posts SET comment_count = $comment->c WHERE ID = '$comment->comment_post_ID'" ); } } @@ -426,7 +426,7 @@ function __get_option($setting) { $option = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'"); - if ( 'home' == $setting && '' == $value ) + if ( 'home' == $setting && '' == $option ) return __get_option('siteurl'); if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting ) |