Changeset 14291

Timestamp:

04/29/2010 06:01:44 AM (15 years ago)

Author:

nacin

Message:

Show 'no items' message in post/tax meta boxes for nav menu admin instead of empty tabs.

File:

• trunk/wp-admin/includes/nav-menu.php (modified) (3 diffs)

trunk/wp-admin/includes/nav-menu.php

@@ -482 +482 @@
     $get_posts = new WP_Query;
     $posts = $get_posts->query( $args );
+    $count_posts = (int) @count( $posts );
+    if ( ! $count_posts ) {
+        echo '<p>' . __( 'No items.' ) . '</p>';
+        return;
+    }
 
     $post_type_object = get_post_type_object($post_type_name);
 
     $num_pages = $get_posts->max_num_pages;
-
-    $count_posts = (int) @count( $posts );
 
     if ( isset( $get_posts->found_posts ) && ( $get_posts->found_posts > $count_posts ) ) {
@@ -646 +649 @@
 function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
     $taxonomy_name = $taxonomy['args']->name;
+    if ( ! $term_count = wp_count_terms( $taxonomy_name ) ) {
+        echo '<p>' . __( 'No items.' ) . '</p>';
+        return;
+    }
     // paginate browsing for large numbers of objects
     $per_page = 50;
     $pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
     $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
-    
+
     $args = array(
         'child_of' => 0, 
@@ -665 +672 @@
     );
 
-    $num_pages = ceil( wp_count_terms($taxonomy_name) / $per_page );
+    $num_pages = ceil( $term_count / $per_page );
 
     $page_links = paginate_links( array(