Drop old tables. Props Nazgul. fixes #4995
git-svn-id: http://svn.automattic.com/wordpress/trunk@6126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
9bfccd6286
commit
c352f29893
|
@ -195,6 +195,9 @@ function upgrade_all() {
|
||||||
if ( $wp_current_db_version < 5539 )
|
if ( $wp_current_db_version < 5539 )
|
||||||
upgrade_230();
|
upgrade_230();
|
||||||
|
|
||||||
|
if ( $wp_current_db_version < 6124 )
|
||||||
|
upgrade_230_old_tables();
|
||||||
|
|
||||||
maybe_disable_automattic_widgets();
|
maybe_disable_automattic_widgets();
|
||||||
|
|
||||||
$wp_rewrite->flush_rules();
|
$wp_rewrite->flush_rules();
|
||||||
|
@ -693,6 +696,13 @@ function upgrade_230_options_table() {
|
||||||
$wpdb->show_errors();
|
$wpdb->show_errors();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function upgrade_230_old_tables() {
|
||||||
|
global $wpdb;
|
||||||
|
$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories');
|
||||||
|
$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'link2cat');
|
||||||
|
$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat');
|
||||||
|
}
|
||||||
|
|
||||||
function upgrade_old_slugs() {
|
function upgrade_old_slugs() {
|
||||||
// upgrade people who were using the Redirect Old Slugs plugin
|
// upgrade people who were using the Redirect Old Slugs plugin
|
||||||
global $wpdb;
|
global $wpdb;
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
// This holds the version number in a separate file so we can bump it without cluttering the SVN
|
// This holds the version number in a separate file so we can bump it without cluttering the SVN
|
||||||
|
|
||||||
$wp_version = '2.3-beta3';
|
$wp_version = '2.3-beta3';
|
||||||
$wp_db_version = 6075;
|
$wp_db_version = 6124;
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in New Issue