Changeset 14580

Timestamp:

05/12/2010 07:12:18 PM (14 years ago)

Author:

ryan

Message:

Fix bulk editing of non-hierarchical taxonomies. Props prettyboymp. fixes #13153

File:

• trunk/wp-admin/includes/post.php (modified) (2 diffs)

trunk/wp-admin/includes/post.php

@@ -312 +312 @@
 
         $tax_names = get_object_taxonomies( get_post($post_ID) );
-
         if ( isset($new_cats) && in_array( 'category', $tax_names ) ) {
             $cats = (array) wp_get_post_categories($post_ID);
@@ -319 +318 @@
 
         foreach ( $tax_names as $tax_name ) {
-            if( isset( $tax_input[$tax_name])  ) {
-                if ( is_taxonomy_hierarchical( $tax_name ) )
-                    $terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
-                else
-                    $terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
-                $post_data['tax_input'][$tax_name] = array_merge( $terms, $tax_input[$tax_name] );
-            }
+            $taxonomy_obj = get_taxonomy($tax_name);
+            if(  isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->assign_cap ) )
+                $new_terms = $tax_input[$tax_name];
+            else 
+                $new_terms = array();
+                
+            if ( $taxonomy_obj->hierarchical )
+                $current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
+            else
+                $current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+
+            $post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms );
         }