Changeset 7778

Timestamp:

04/22/2008 10:46:09 PM (16 years ago)

Author:

ryan

Message:

wp_category_checklist() fixes from mdawaffe. fixes #6810 for 2.5

Location:

branches/2.5

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (3 diffs)
• wp-admin/js/post.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

branches/2.5/wp-admin/admin-ajax.php

@@ -163 +163 @@
             continue;
         $category = get_category( $cat_id );
-        $checked_categories[] = $cat_id;
         ob_start();
-            dropdown_categories( 0, $category );
+            wp_category_checklist( 0, $cat_id, $checked_categories );
         $data = ob_get_contents();
         ob_end_clean();

branches/2.5/wp-admin/includes/template.php

@@ -149 +149 @@
 }
 
-function wp_category_checklist( $post_id = 0 ) {
+function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false ) {
     $walker = new Walker_Category_Checklist;
+    $descendants_and_self = (int) $descendants_and_self;
 
     $args = array();
@@ -158 +159 @@
     else
         $args['selected_cats'] = array();
-    $args['popular_cats'] = get_terms( 'category', array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10 ) );
-    $categories = get_categories('get=all');
+    if ( is_array( $selected_cats ) )
+        $args['selected_cats'] = $selected_cats;
+    $args['popular_cats'] = get_terms( 'category', array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+    if ( $descendants_and_self ) {
+        $categories = get_categories( "child_of=$descendants_and_self&hierarchical=0&hide_empty=0" );
+        $self = get_category( $descendants_and_self );
+        array_unshift( $categories, $self );
+    } else {
+        $categories = get_categories('get=all');
+    }
+
     $args = array($categories, 0, $args);
     $output = call_user_func_array(array(&$walker, 'walk'), $args);
@@ -167 +177 @@
 
 function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10 ) {
-    $categories = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number ) );
+    $categories = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
 
     $popular_ids = array();

branches/2.5/wp-admin/js/post.js

@@ -132 +132 @@
                 var val = th.find('input').val();
                 var id = th.find('input')[0].id
-                jQuery('#' + id).change( syncChecks );
+                jQuery('#' + id).change( syncChecks ).change();
                 if ( newCatParent.find( 'option[value=' + val + ']' ).size() )
                     return;

branches/2.5/wp-includes/script-loader.php

@@ -145 +145 @@
                 'cancel' => __('Cancel'),
             ) );
-            $this->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080411' );
+            $this->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20080422' );
             $this->localize( 'post', 'postL10n', array(
                 'tagsUsed' =>  __('Tags used on this post:'),