<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14580] trunk/wp-admin/includes/post.php:
Fix bulk editing of non-hierarchical taxonomies.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14580">14580</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-12 19:12:18 +0000 (Wed, 12 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix bulk editing of non-hierarchical taxonomies. Props prettyboymp. fixes <a href="http://trac.wordpress.org/ticket/13153">#13153</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14579 => 14580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-05-12 18:59:03 UTC (rev 14579)
+++ trunk/wp-admin/includes/post.php 2010-05-12 19:12:18 UTC (rev 14580)
</span><span class="lines">@@ -311,20 +311,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $tax_names = get_object_taxonomies( get_post($post_ID) );
</span><del>-
</del><span class="cx"> if ( isset($new_cats) && in_array( 'category', $tax_names ) ) {
</span><span class="cx"> $cats = (array) wp_get_post_categories($post_ID);
</span><span class="cx"> $post_data['post_category'] = array_unique( array_merge($cats, $new_cats) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach ( $tax_names as $tax_name ) {
</span><del>- 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] );
- }
</del><ins>+ $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 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $post_data['ID'] = $post_ID;
</span><span class="lines">@@ -1606,4 +1610,4 @@
</span><span class="cx"> /* ]]> */
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><del>-}
</del><ins>+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>