<!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>[12967] trunk/wp-admin/includes:
Allow viewing of Attached hierarchical Terms when the user doesnt have Manage capability of the taxonomy
, Only set terms if user has Management capability.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12967">12967</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-05 14:33:29 +0000 (Fri, 05 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow viewing of Attached hierarchical Terms when the user doesnt have Manage capability of the taxonomy, Only set terms if user has Management capability. See <a href="http://trac.wordpress.org/ticket/12035">#12035</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (12966 => 12967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-02-05 14:16:31 UTC (rev 12966)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-02-05 14:33:29 UTC (rev 12967)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> function post_tags_meta_box($post, $box) {
</span><span class="cx"> $tax_name = esc_attr(substr($box['id'], 8));
</span><span class="cx"> $taxonomy = get_taxonomy($tax_name);
</span><del>- if ( !current_user_can($taxonomy->manage_cap) )
</del><ins>+ if ( !current_user_can($taxonomy->manage_cap) ) // @todo: Display the terms, do not edit.
</ins><span class="cx"> return;
</span><span class="cx"> $helps = isset($taxonomy->helps) ? esc_attr($taxonomy->helps) : __('Separate tags with commas.');
</span><span class="cx"> ?>
</span><span class="lines">@@ -279,8 +279,6 @@
</span><span class="cx"> extract( wp_parse_args($args, $defaults), EXTR_SKIP );
</span><span class="cx"> $tax = get_taxonomy($taxonomy);
</span><span class="cx">
</span><del>- if ( !current_user_can($tax->manage_cap) )
- return;
</del><span class="cx"> ?>
</span><span class="cx"> <div id="taxonomy-<?php echo $taxonomy; ?>" class="categorydiv">
</span><span class="cx"> <ul id="<?php echo $taxonomy; ?>-tabs" class="category-tabs">
</span><span class="lines">@@ -296,7 +294,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="<?php echo $taxonomy; ?>-all" class="tabs-panel">
</span><span class="cx"> <ul id="<?php echo $taxonomy; ?>checklist" class="list:<?php echo $taxonomy?> categorychecklist form-no-clear">
</span><del>- <?php wp_terms_checklist($post->ID, array('taxonomy'=>$taxonomy, 'popular_cats'=> $popular_ids)) ?>
</del><ins>+ <?php wp_terms_checklist($post->ID, array( 'taxonomy' => $taxonomy, 'popular_cats' => $popular_ids ) ) ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (12966 => 12967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-02-05 14:16:31 UTC (rev 12966)
+++ trunk/wp-admin/includes/template.php 2010-02-05 14:33:29 UTC (rev 12967)
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> $name = 'tax_input['.$taxonomy.']';
</span><span class="cx">
</span><span class="cx"> $class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : '';
</span><del>- $output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" . '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' . (in_array( $category->term_id, $selected_cats ) ? ' checked="checked"' : "" ) . '/> ' . esc_html( apply_filters('the_category', $category->name )) . '</label>';
</del><ins>+ $output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" . '<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' . (in_array( $category->term_id, $selected_cats ) ? ' checked="checked"' : "" ) . (!empty($args['disabled']) ? 'disabled="disabled"' : '') . '/> ' . esc_html( apply_filters('the_category', $category->name )) . '</label>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function end_el(&$output, $category, $depth, $args) {
</span><span class="lines">@@ -528,6 +528,9 @@
</span><span class="cx">
</span><span class="cx"> $args = array('taxonomy' => $taxonomy);
</span><span class="cx">
</span><ins>+ $tax = get_taxonomy($taxonomy);
+ $args['disabled'] = !current_user_can($tax->manage_cap);
+
</ins><span class="cx"> if ( is_array( $selected_cats ) )
</span><span class="cx"> $args['selected_cats'] = $selected_cats;
</span><span class="cx"> elseif ( $post_id )
</span><span class="lines">@@ -588,6 +591,12 @@
</span><span class="cx">
</span><span class="cx"> $terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
</span><span class="cx">
</span><ins>+ $tax = get_taxonomy($taxonomy);
+ if ( ! current_user_can($tax->manage_cap) )
+ $disabled = 'disabled="disabled"';
+ else
+ $disabled = '';
+
</ins><span class="cx"> $popular_ids = array();
</span><span class="cx"> foreach ( (array) $terms as $term ) {
</span><span class="cx"> $popular_ids[] = $term->term_id;
</span><span class="lines">@@ -599,7 +608,7 @@
</span><span class="cx">
</span><span class="cx"> <li id="<?php echo $id; ?>" class="popular-category">
</span><span class="cx"> <label class="selectit">
</span><del>- <input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" />
</del><ins>+ <input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php echo $disabled ?>/>
</ins><span class="cx"> <?php echo esc_html( apply_filters( 'the_category', $term->name ) ); ?>
</span><span class="cx"> </label>
</span><span class="cx"> </li>
</span></span></pre>
</div>
</div>
</body>
</html>