<!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>[13217] trunk: More Taxonomy cap checks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13217">13217</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-19 10:26:44 +0000 (Fri, 19 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More Taxonomy cap checks. See <a href="http://trac.wordpress.org/ticket/12035">#12035</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (13216 => 13217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2010-02-19 10:21:29 UTC (rev 13216)
+++ trunk/wp-admin/edit-form-advanced.php 2010-02-19 10:26:44 UTC (rev 13217)
</span><span class="lines">@@ -97,9 +97,6 @@
</span><span class="cx"> $taxonomy = get_taxonomy($tax_name);
</span><span class="cx"> $label = isset($taxonomy->label) ? esc_attr($taxonomy->label) : $tax_name;
</span><span class="cx">
</span><del>- if ( !current_user_can($taxonomy->manage_cap) )
- continue;
-
</del><span class="cx"> if ( !is_taxonomy_hierarchical($tax_name) )
</span><span class="cx"> add_meta_box('tagsdiv-' . $tax_name, $label, 'post_tags_meta_box', $post_type, 'side', 'core');
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (13216 => 13217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-02-19 10:21:29 UTC (rev 13216)
+++ trunk/wp-admin/menu.php 2010-02-19 10:26:44 UTC (rev 13217)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> if ( ! $tax->show_ui || ! in_array('post', (array) $tax->object_type, true) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- $submenu['edit.php'][$i++] = array( esc_attr($tax->label), 'manage_categories', 'edit-tags.php?taxonomy=' . $tax->name );
</del><ins>+ $submenu['edit.php'][$i++] = array( esc_attr($tax->label), $tax->manage_cap, 'edit-tags.php?taxonomy=' . $tax->name );
</ins><span class="cx"> }
</span><span class="cx"> unset($tax);
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> if ( ! $tax->show_ui || ! in_array($ptype, (array) $tax->object_type, true) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- $submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr($tax->label), 'manage_categories', "edit-tags.php?taxonomy=$tax->name&amp;post_type=$ptype" );
</del><ins>+ $submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr($tax->label), $tax->manage_cap, "edit-tags.php?taxonomy=$tax->name&amp;post_type=$ptype" );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> unset($ptype, $ptype_obj);
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (13216 => 13217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-02-19 10:21:29 UTC (rev 13216)
+++ trunk/wp-includes/post.php 2010-02-19 10:26:44 UTC (rev 13217)
</span><span class="lines">@@ -2174,8 +2174,11 @@
</span><span class="cx"> wp_set_post_tags( $post_ID, $tags_input );
</span><span class="cx"> // new-style support for all tag-like taxonomies
</span><span class="cx"> if ( !empty($tax_input) ) {
</span><del>- foreach ( $tax_input as $taxonomy => $tags )
- wp_set_post_terms( $post_ID, $tags, $taxonomy );
</del><ins>+ foreach ( $tax_input as $taxonomy => $tags ) {
+ $taxonomy_obj = get_taxonomy($taxonomy);
+ if ( current_user_can($taxonomy_obj->manage_cap) )
+ wp_set_post_terms( $post_ID, $tags, $taxonomy );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $current_guid = get_post_field( 'guid', $post_ID );
</span></span></pre>
</div>
</div>
</body>
</html>