Changeset 12967

Timestamp:

02/05/2010 02:33:29 PM (15 years ago)

Author:

dd32

Message:

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 #12035

Location:

trunk/wp-admin/includes

Files:

• meta-boxes.php (modified) (3 diffs)
• template.php (modified) (4 diffs)

trunk/wp-admin/includes/meta-boxes.php

@@ -240 +240 @@
     $tax_name = esc_attr(substr($box['id'], 8));
     $taxonomy = get_taxonomy($tax_name);
-    if ( !current_user_can($taxonomy->manage_cap) )
+    if ( !current_user_can($taxonomy->manage_cap) ) // @todo: Display the terms, do not edit.
         return;
     $helps = isset($taxonomy->helps) ? esc_attr($taxonomy->helps) : __('Separate tags with commas.');
@@ -280 +280 @@
     $tax = get_taxonomy($taxonomy);
 
-    if ( !current_user_can($tax->manage_cap) )
-        return;
     ?>
     <div id="taxonomy-<?php echo $taxonomy; ?>" class="categorydiv">
@@ -297 +295 @@
         <div id="<?php echo $taxonomy; ?>-all" class="tabs-panel">
             <ul id="<?php echo $taxonomy; ?>checklist" class="list:<?php echo $taxonomy?> categorychecklist form-no-clear">
-                <?php wp_terms_checklist($post->ID, array('taxonomy'=>$taxonomy, 'popular_cats'=> $popular_ids)) ?>
+                <?php wp_terms_checklist($post->ID, array( 'taxonomy' => $taxonomy, 'popular_cats' => $popular_ids ) ) ?>
             </ul>
         </div>

trunk/wp-admin/includes/template.php

@@ -475 +475 @@
 
         $class = in_array( $category->term_id, $popular_cats ) ? ' class="popular-category"' : '';
-        $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>';
+        $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>';
     }
 
@@ -529 +529 @@
     $args = array('taxonomy' => $taxonomy);
 
+    $tax = get_taxonomy($taxonomy);
+    $args['disabled'] = !current_user_can($tax->manage_cap);
+
     if ( is_array( $selected_cats ) )
         $args['selected_cats'] = $selected_cats;
@@ -588 +591 @@
 
     $terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
+
+    $tax = get_taxonomy($taxonomy);
+    if ( ! current_user_can($tax->manage_cap) )
+        $disabled = 'disabled="disabled"';
+    else
+        $disabled = '';
 
     $popular_ids = array();
@@ -600 +609 @@
         <li id="<?php echo $id; ?>" class="popular-category">
             <label class="selectit">
-            <input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" />
+            <input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php echo $disabled ?>/>
                 <?php echo esc_html( apply_filters( 'the_category', $term->name ) ); ?>
             </label>