Ticket #6810: 6810.diff

wp-includes/script-loader.php

@@ -144 +144 @@
                                 'save' => __('Save'),
                                 '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:'),
                                 'add' => attribute_escape(__('Add')),

wp-admin/admin-ajax.php

@@ -162 +162 @@
                 if ( $parent ) // Do these all at once in a second
                         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();
                 $x->add( array(

wp-admin/includes/template.php

@@ -148 +148 @@
         }
 }
 
-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();
         
@@ -157 +158 @@
                 $args['selected_cats'] = wp_get_post_categories($post_id);
         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);
 
@@ -166 +176 @@
 }
 
 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();
         foreach ( (array) $categories as $category ) {

wp-admin/js/post.js

@@ -131 +131 @@
                                 var th = jQuery(this);
                                 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;
                                 var name = jQuery.trim( th.text() );