Ticket #14084: garyc40.14084.2.diff

wp-includes/post.php

@@ -2328 +2328 @@
         )
                 return ( OBJECT == $mode ? null : array() );
 
+        // get custom taxonomies
+        $taxonomies = get_object_taxonomies( $post, 'names', array( '_builtin' => false ) );
+        $tax_input = array();
+
+        if ( ! empty( $taxonomies ) ) {
+                foreach ( $taxonomies as $taxonomy ) {
+                        $post_terms = wp_get_post_terms( $postid, $taxonomy, array( 'fields' => 'ids' ) );
+                        if ( ! empty( $post_terms ) )
+                                $tax_input[$taxonomy] = $post_terms;
+                }
+        }
+
         // Set categories and tags
         if ( $mode == OBJECT ) {
                 $post->post_category = array();
@@ -2336 +2348 @@
                 $post->tags_input = array();
                 if ( is_object_in_taxonomy($post->post_type, 'post_tag') )
                         $post->tags_input = wp_get_post_tags($postid, array('fields' => 'names'));
+                $post->tax_input = $tax_input;
         } else {
                 $post['post_category'] = array();
                 if ( is_object_in_taxonomy($post['post_type'], 'category') )
@@ -2343 +2356 @@
                 $post['tags_input'] = array();
                 if ( is_object_in_taxonomy($post['post_type'], 'post_tag') )
                         $post['tags_input'] = wp_get_post_tags($postid, array('fields' => 'names'));
+                $post['tax_input'] = $tax_input;
         }
-
         return $post;
 }
 

wp-includes/taxonomy.php

@@ -140 +140 @@
  *
  * @param array|string|object $object Name of the type of taxonomy object, or an object (row from posts)
  * @param string $output The type of output to return, either taxonomy 'names' or 'objects'. 'names' is the default.
+ * @param array $args An array of key => value arguments to match against the taxonomy objects.
  * @return array The names of all taxonomy of $object_type.
  */
-function get_object_taxonomies($object, $output = 'names') {
-        global $wp_taxonomies;
+function get_object_taxonomies( $object, $output = 'names', $args = array() ) {
 
         if ( is_object($object) ) {
                 if ( $object->post_type == 'attachment' )
@@ -152 +152 @@
         }
 
         $object = (array) $object;
-
-        $taxonomies = array();
-        foreach ( (array) $wp_taxonomies as $tax_name => $tax_obj ) {
-                if ( array_intersect($object, (array) $tax_obj->object_type) ) {
-                        if ( 'names' == $output )
-                                $taxonomies[] = $tax_name;
-                        else
-                                $taxonomies[ $tax_name ] = $tax_obj;
-                }
+        
+        $list = get_taxonomies( $args, 'objects' );
+        
+        foreach ( $list as $tax_name => $tax_obj ) {
+                if ( ! array_intersect($object, (array) $tax_obj->object_type) )
+                        unset( $list[$tax_name] );
         }
 
-        return $taxonomies;
+        if ( 'names' == $output )
+                $list = array_values( wp_list_pluck( $list, 'name' ) );
+
+        return $list;
 }
 
 /**
@@ -256 +256 @@
  * boolean value.
  *
  * update_count_callback - works much like a hook, in that it will be called
- * when the count is updated.
+ * when the count is updated; if not defined and show_ui is true, defaults to '_update_post_term_count'.
+ * To suppress default callback in any cases, set update_count_callback to false.
  *
  * rewrite - false to prevent rewrite, or array('slug'=>$slug) to customize
  * permastruct; default will use $taxonomy as slug.
@@ -335 +336 @@
         if ( is_null($args['show_ui']) )
                 $args['show_ui'] = $args['public'];
 
+        if ( $args['show_ui'] && $args['update_count_callback'] === '' ) {
+                $args['update_count_callback'] = '_update_post_term_count';
+        }
+
         // Whether to show this type in nav-menus.php. Defaults to the setting for public.
         if ( null === $args['show_in_nav_menus'] )
                 $args['show_in_nav_menus'] = $args['public'];