Changeset 15263

Timestamp:

06/15/2010 08:07:02 PM (13 years ago)

Author:

markjaquith

Message:

Make the number of taxonomies to display per page setting actually stick. props nacin. fixes #13899

Location:

trunk

Files:

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

trunk/wp-admin/edit-tags.php

@@ -250 +250 @@
     $pagenum = 1;
 
-if ( 'post_tag' == $taxonomy )
-    $tags_per_page = (int) get_user_option( 'edit_tags_per_page' );
-elseif ( 'category' == $taxonomy )
-    $tags_per_page = (int) get_user_option( 'categories_per_page' );
-else
-    $tags_per_page = (int) get_user_option( 'edit_' .  $taxonomy . '_per_page' );
+$tags_per_page = (int) get_user_option( 'edit_' .  $taxonomy . '_per_page' );
 
 if ( empty($tags_per_page) || $tags_per_page < 1 )

trunk/wp-admin/includes/misc.php

@@ -338 +338 @@
         if ( in_array($type, get_post_types()) )
             $map_option = 'edit_per_page';
+        if ( in_array( $type, get_taxonomies()) )
+            $map_option = 'edit_tags_per_page';
+
 
         switch ( $map_option ) {
@@ -345 +348 @@
             case 'edit_comments_per_page':
             case 'upload_per_page':
-            case 'categories_per_page':
             case 'edit_tags_per_page':
             case 'plugins_per_page':

trunk/wp-admin/includes/upgrade.php

@@ -441 +441 @@
         upgrade_290();
 
-    if ( $wp_current_db_version < 15187 )
+    if ( $wp_current_db_version < 15260 )
         upgrade_300();
 
@@ -1134 +1134 @@
         $prefix = like_escape($wpdb->base_prefix);
         $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%metaboxorder%' OR meta_key LIKE '{$prefix}%screen_layout%'
-                     OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden'" );
+                     OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden' OR meta_key = 'categories_per_page' OR meta_key = 'edit_tags_per_page'" );
     }
 

trunk/wp-includes/version.php

@@ -9 +9 @@
  * @global string $wp_version
  */
-$wp_version = '3.0-RC3-15257';
+$wp_version = '3.0-RC3-15260';
 
 /**
@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 15187;
+$wp_db_version = 15260;
 
 /**