Changeset 13081

Timestamp:

02/13/2010 03:52:33 AM (17 years ago)

Author:

dd32

Message:

Fix Terms Per Page for taxonomies, Apply old Category filter to value. See #11838

Location:

trunk/wp-admin

Files:

• edit-tags.php (modified) (1 diff)
• includes/template.php (modified) (3 diffs)

trunk/wp-admin/edit-tags.php

@@ -197 +197 @@
         $pagenum = 1;
 
-$tags_per_page = (int) get_user_option( 'edit_tags_per_page' );
+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' );
+
 if ( empty($tags_per_page) || $tags_per_page < 1 )
         $tags_per_page = 20;
-$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
-$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
+
+if ( 'post_tag' == $taxonomy ) {
+        $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
+        $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
+} elseif ( 'category' == $taxonomy ) { 
+        $tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter
+} else {
+        $tags_per_page = apply_filters( 'edit_' . $taxonomy . '_per_page', $tags_per_page );
+}
 
 if ( !empty($_GET['s']) ) {

trunk/wp-admin/includes/template.php

@@ -3639 +3639 @@
                         $per_page_label = __('Media items per page:');
                         break;
-                case 'categories':
-                        $per_page_label = __('Categories per page:');
-                        break;
                 case 'edit-tags':
-                        $per_page_label = __('Tags per page:');
+                        global $taxonomy, $tax;
+                        if ( 'post_tag' == $taxonomy )
+                                $per_page_label = __('Tags per page:');
+                        elseif ( 'category' == $taxonomy )
+                                $per_page_label = __('Categories per page:');
+                        else
+                                $per_page_label = sprintf(_x('%s per page:', '%s: plural taxonomy name'), $tax->label);
                         break;
                 case 'plugins':
@@ -3653 +3656 @@
 
         $option = str_replace( '-', '_', "{$screen->id}_per_page" );
+        if ( 'edit_tags_per_page' == $option ) {
+                if ( 'category' == $taxonomy )
+                        $option = 'categories_per_page';
+                elseif ( 'post_tag' != $taxonomy )
+                        $option = 'edit_' . $taxonomy . '_per_page';
+        }
+
         $per_page = (int) get_user_option( $option );
         if ( empty( $per_page ) || $per_page < 1 ) {
@@ -3660 +3670 @@
                         $per_page = 20;
         }
+
         if ( 'edit_comments_per_page' == $option )
                 $per_page = apply_filters( 'comments_per_page', $per_page, isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all' );
-        elseif ( 'categories' == $option )
+        elseif ( 'categories_per_page' == $option )
                 $per_page = apply_filters( 'edit_categories_per_page', $per_page );
         else