Changeset 21811

Timestamp:

09/11/2012 02:08:29 AM (12 years ago)

Author:

nacin

Message:

Remove old edit_*_per_page usermeta keys.

These per-page values were when the post type or taxonomy name has a hyphen.
Previously, these were converted to underscores. This changed in [21322].

fixes #18958.

Location:

trunk

Files:

• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/includes/upgrade.php

@@ -400 +400 @@
         upgrade_340();
 
-    if ( $wp_current_db_version < 21501 )
+    if ( $wp_current_db_version < 21811 )
         upgrade_350();
 
@@ -1196 +1196 @@
     if ( $wp_current_db_version < 21501 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
         update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+
+    if ( $wp_current_db_version < 21811 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+        $meta_keys = array();
+        foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
+            if ( false !== strpos( $name, '-' ) )
+            $meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+        }
+        if ( $meta_keys ) {
+            $meta_keys = implode( "', '", $meta_keys );
+            $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('$meta_keys')" );
+        }
+    }
+
 }
 

trunk/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 21804;
+$wp_db_version = 21811;
 
 /**