<!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>[23352] trunk/wp-admin/includes: Consistently use a helper function instead of directly printing the disabled attribute.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23352">23352</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-01-28 03:23:01 +0000 (Mon, 28 Jan 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consistently use a helper function instead of directly printing the disabled attribute.
Remove an erroneous esc_attr() call.
fixes <a href="http://core.trac.wordpress.org/ticket/23194">#23194</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 (23351 => 23352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2013-01-28 02:55:06 UTC (rev 23351)
+++ trunk/wp-admin/includes/meta-boxes.php 2013-01-28 03:23:01 UTC (rev 23352)
</span><span class="lines">@@ -339,27 +339,27 @@
</span><span class="cx"> extract( wp_parse_args($args, $defaults), EXTR_SKIP );
</span><span class="cx"> $tax_name = esc_attr($taxonomy);
</span><span class="cx"> $taxonomy = get_taxonomy($taxonomy);
</span><del>- $disabled = !current_user_can($taxonomy->cap->assign_terms) ? 'disabled="disabled"' : '';
</del><ins>+ $user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
</ins><span class="cx"> $comma = _x( ',', 'tag delimiter' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="tagsdiv" id="<?php echo $tax_name; ?>">
</span><span class="cx"> <div class="jaxtag">
</span><span class="cx"> <div class="nojs-tags hide-if-js">
</span><span class="cx"> <p><?php echo $taxonomy->labels->add_or_remove_items; ?></p>
</span><del>- <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php echo $disabled; ?>><?php echo str_replace( ',', $comma . ' ', get_terms_to_edit( $post->ID, $tax_name ) ); // textarea_escaped by esc_attr() ?></textarea></div>
- <?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
</del><ins>+ <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms ); ?>><?php echo str_replace( ',', $comma . ' ', get_terms_to_edit( $post->ID, $tax_name ) ); // textarea_escaped by esc_attr() ?></textarea></div>
+ <?php if ( $user_can_assign_terms ) : ?>
</ins><span class="cx"> <div class="ajaxtag hide-if-no-js">
</span><span class="cx"> <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
</span><span class="cx"> <div class="taghint"><?php echo $taxonomy->labels->add_new_item; ?></div>
</span><span class="cx"> <p><input type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
</span><span class="cx"> <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" /></p>
</span><span class="cx"> </div>
</span><del>- <p class="howto"><?php echo esc_attr( $taxonomy->labels->separate_items_with_commas ); ?></p>
</del><ins>+ <p class="howto"><?php echo $taxonomy->labels->separate_items_with_commas; ?></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="tagchecklist"></div>
</span><span class="cx"> </div>
</span><del>-<?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
</del><ins>+<?php if ( $user_can_assign_terms ) : ?>
</ins><span class="cx"> <p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->choose_from_most_used; ?></a></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (23351 => 23352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2013-01-28 02:55:06 UTC (rev 23351)
+++ trunk/wp-admin/includes/template.php 2013-01-28 03:23:01 UTC (rev 23352)
</span><span class="lines">@@ -176,10 +176,6 @@
</span><span class="cx"> $terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
</span><span class="cx">
</span><span class="cx"> $tax = get_taxonomy($taxonomy);
</span><del>- if ( ! current_user_can($tax->cap->assign_terms) )
- $disabled = 'disabled="disabled"';
- else
- $disabled = '';
</del><span class="cx">
</span><span class="cx"> $popular_ids = array();
</span><span class="cx"> foreach ( (array) $terms as $term ) {
</span><span class="lines">@@ -192,7 +188,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; ?>" <?php echo $disabled ?>/>
</del><ins>+ <input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php disabled( ! current_user_can( $tax->cap->assign_terms ) ); ?> />
</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>