<!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" />
<title>[39979] branches/3.9/src/wp-admin/press-this.php: Press This: Do not show Categories & Tags UI for users who cannot assign terms to posts anyways.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/39979">39979</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/39979","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-01-26 14:11:38 +0000 (Thu, 26 Jan 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Press This: Do not show Categories & Tags UI for users who cannot assign terms to posts anyways.
Merge of <a href="https://core.trac.wordpress.org/changeset/39968">[39968]</a> to the 3.9 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches39srcwpadminpressthisphp">branches/3.9/src/wp-admin/press-this.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches39srcwpadminpressthisphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.9/src/wp-admin/press-this.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.9/src/wp-admin/press-this.php 2017-01-26 14:11:19 UTC (rev 39978)
+++ branches/3.9/src/wp-admin/press-this.php 2017-01-26 14:11:38 UTC (rev 39979)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,8 +32,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can('edit_post', $post_ID) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(__('You are not allowed to edit this post.'));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : '';
- $post['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only accept categories if the user actually can assign
+ $category_tax = get_taxonomy( 'category' );
+ if ( current_user_can( $category_tax->cap->assign_terms ) ) {
+ $post['post_category'] = ( ! empty( $_POST['post_category'] ) ) ? $_POST['post_category'] : array();
+ }
+
+ // Only accept taxonomies if the user can actually assign
+ if ( ! empty( $_POST['tax_input'] ) ) {
+ $tax_input = $_POST['tax_input'];
+ foreach ( $tax_input as $tax => $_ti ) {
+ $tax_object = get_taxonomy( $tax );
+ if ( ! $tax_object || ! current_user_can( $tax_object->cap->assign_terms ) ) {
+ unset( $tax_input[ $tax ] );
+ }
+ }
+
+ $post['tax_input'] = $tax_input;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $post['post_title'] = isset($_POST['title']) ? $_POST['title'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $content = isset($_POST['content']) ? $_POST['content'] : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,75 +529,81 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $tax = get_taxonomy( 'category' ); ?>
- <div id="categorydiv" class="postbox">
- <div class="handlediv" title="<?php esc_attr_e( 'Click to toggle' ); ?>"><br /></div>
- <h3 class="hndle"><?php _e('Categories') ?></h3>
- <div class="inside">
- <div id="taxonomy-category" class="categorydiv">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <ul id="category-tabs" class="category-tabs">
- <li class="tabs"><a href="#category-all"><?php echo $tax->labels->all_items; ?></a></li>
- <li class="hide-if-no-js"><a href="#category-pop"><?php _e( 'Most Used' ); ?></a></li>
- </ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax = get_taxonomy( 'category' );
+ if ( current_user_can( $tax->cap->assign_terms ) ) :
+ ?>
+ <div id="categorydiv" class="postbox">
+ <div class="handlediv" title="<?php esc_attr_e( 'Click to toggle' ); ?>"><br /></div>
+ <h3 class="hndle"><?php _e('Categories') ?></h3>
+ <div class="inside">
+ <div id="taxonomy-category" class="categorydiv">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="category-pop" class="tabs-panel" style="display: none;">
- <ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
- <?php $popular_ids = wp_popular_terms_checklist( 'category' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ul id="category-tabs" class="category-tabs">
+ <li class="tabs"><a href="#category-all"><?php echo $tax->labels->all_items; ?></a></li>
+ <li class="hide-if-no-js"><a href="#category-pop"><?php _e( 'Most Used' ); ?></a></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </div>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="category-all" class="tabs-panel">
- <ul id="categorychecklist" data-wp-lists="list:category" class="categorychecklist form-no-clear">
- <?php wp_terms_checklist($post_ID, array( 'taxonomy' => 'category', 'popular_cats' => $popular_ids ) ) ?>
- </ul>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="category-pop" class="tabs-panel" style="display: none;">
+ <ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
+ <?php $popular_ids = wp_popular_terms_checklist( 'category' ); ?>
+ </ul>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( !current_user_can($tax->cap->assign_terms) ) : ?>
- <p><em><?php _e('You cannot modify this Taxonomy.'); ?></em></p>
- <?php endif; ?>
- <?php if ( current_user_can($tax->cap->edit_terms) ) : ?>
- <div id="category-adder" class="wp-hidden-children">
- <h4>
- <a id="category-add-toggle" href="#category-add" class="hide-if-no-js">
- <?php printf( __( '+ %s' ), $tax->labels->add_new_item ); ?>
- </a>
- </h4>
- <p id="category-add" class="category-add wp-hidden-child">
- <label class="screen-reader-text" for="newcategory"><?php echo $tax->labels->add_new_item; ?></label>
- <input type="text" name="newcategory" id="newcategory" class="form-required form-input-tip" value="<?php echo esc_attr( $tax->labels->new_item_name ); ?>" aria-required="true"/>
- <label class="screen-reader-text" for="newcategory_parent">
- <?php echo $tax->labels->parent_item_colon; ?>
- </label>
- <?php wp_dropdown_categories( array( 'taxonomy' => 'category', 'hide_empty' => 0, 'name' => 'newcategory_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '— ' . $tax->labels->parent_item . ' —' ) ); ?>
- <input type="button" id="category-add-submit" data-wp-lists="add:categorychecklist:category-add" class="button category-add-submit" value="<?php echo esc_attr( $tax->labels->add_new_item ); ?>" />
- <?php wp_nonce_field( 'add-category', '_ajax_nonce-add-category', false ); ?>
- <span id="category-ajax-response"></span>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="category-all" class="tabs-panel">
+ <ul id="categorychecklist" data-wp-lists="list:category" class="categorychecklist form-no-clear">
+ <?php wp_terms_checklist($post_ID, array( 'taxonomy' => 'category', 'popular_cats' => $popular_ids ) ) ?>
+ </ul>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php if ( current_user_can($tax->cap->edit_terms) ) : ?>
+ <div id="category-adder" class="wp-hidden-children">
+ <h4>
+ <a id="category-add-toggle" href="#category-add" class="hide-if-no-js">
+ <?php printf( __( '+ %s' ), $tax->labels->add_new_item ); ?>
+ </a>
+ </h4>
+ <p id="category-add" class="category-add wp-hidden-child">
+ <label class="screen-reader-text" for="newcategory"><?php echo $tax->labels->add_new_item; ?></label>
+ <input type="text" name="newcategory" id="newcategory" class="form-required form-input-tip" value="<?php echo esc_attr( $tax->labels->new_item_name ); ?>" aria-required="true"/>
+ <label class="screen-reader-text" for="newcategory_parent">
+ <?php echo $tax->labels->parent_item_colon; ?>
+ </label>
+ <?php wp_dropdown_categories( array( 'taxonomy' => 'category', 'hide_empty' => 0, 'name' => 'newcategory_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '— ' . $tax->labels->parent_item . ' —' ) ); ?>
+ <input type="button" id="category-add-submit" data-wp-lists="add:categorychecklist:category-add" class="button category-add-submit" value="<?php echo esc_attr( $tax->labels->add_new_item ); ?>" />
+ <?php wp_nonce_field( 'add-category', '_ajax_nonce-add-category', false ); ?>
+ <span id="category-ajax-response"></span>
+ </p>
+ </div>
+ <?php endif; ?>
+ </div>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </div>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="tagsdiv-post_tag" class="postbox">
- <div class="handlediv" title="<?php esc_attr_e( 'Click to toggle' ); ?>"><br /></div>
- <h3><span><?php _e('Tags'); ?></span></h3>
- <div class="inside">
- <div class="tagsdiv" id="post_tag">
- <div class="jaxtag">
- <label class="screen-reader-text" for="newtag"><?php _e('Tags'); ?></label>
- <input type="hidden" name="tax_input[post_tag]" class="the-tags" id="tax-input[post_tag]" value="" />
- <div class="ajaxtag">
- <input type="text" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
- <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax = get_taxonomy( 'post_tag' );
+ if ( current_user_can( $tax->cap->assign_terms ) ) :
+ ?>
+ <div id="tagsdiv-post_tag" class="postbox">
+ <div class="handlediv" title="<?php esc_attr_e( 'Click to toggle' ); ?>"><br /></div>
+ <h3><span><?php _e('Tags'); ?></span></h3>
+ <div class="inside">
+ <div class="tagsdiv" id="post_tag">
+ <div class="jaxtag">
+ <label class="screen-reader-text" for="newtag"><?php _e('Tags'); ?></label>
+ <input type="hidden" name="tax_input[post_tag]" class="the-tags" id="tax-input[post_tag]" value="" />
+ <div class="ajaxtag">
+ <input type="text" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
+ <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" />
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="tagchecklist"></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="tagchecklist"></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="tagcloud-link"><a href="#titlediv" class="tagcloud-link" id="link-post_tag"><?php _e('Choose from the most used tags'); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="tagcloud-link"><a href="#titlediv" class="tagcloud-link" id="link-post_tag"><?php _e('Choose from the most used tags'); ?></a></p>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="posting">
</span></span></pre>
</div>
</div>
</body>
</html>