<!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>[29099] trunk/src/wp-admin/includes/meta-boxes.php: Escape taxonomy name when used in attributes in post_categories_meta_box().</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29099">29099</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2014-07-11 18:55:48 +0000 (Fri, 11 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Escape taxonomy name when used in attributes in post_categories_meta_box().
props pbearne.
fixes <a href="http://core.trac.wordpress.org/ticket/28836">#28836</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/meta-boxes.php (29098 => 29099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/meta-boxes.php 2014-07-11 18:49:12 UTC (rev 29098)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2014-07-11 18:55:48 UTC (rev 29099)
</span><span class="lines">@@ -404,9 +404,8 @@
</span><span class="cx"> $args = $box['args'];
</span><span class="cx"> }
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><del>- $tax = $r['taxonomy'];
- $tax_name = esc_attr( $tax );
- $taxonomy = get_taxonomy( $tax );
</del><ins>+ $tax_name = esc_attr( $r['taxonomy'] );
+ $taxonomy = get_taxonomy( $r['taxonomy'] );
</ins><span class="cx"> $user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
</span><span class="cx"> $comma = _x( ',', 'tag delimiter' );
</span><span class="cx"> ?>
</span><span class="lines">@@ -462,50 +461,50 @@
</span><span class="cx"> $args = $box['args'];
</span><span class="cx"> }
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><del>- $taxonomy = $r['taxonomy'];
- $tax = get_taxonomy( $taxonomy );
</del><ins>+ $tax_name = esc_attr( $r['taxonomy'] );
+ $taxonomy = get_taxonomy( $r['taxonomy'] );
</ins><span class="cx"> ?>
</span><del>- <div id="taxonomy-<?php echo $taxonomy; ?>" class="categorydiv">
- <ul id="<?php echo $taxonomy; ?>-tabs" class="category-tabs">
- <li class="tabs"><a href="#<?php echo $taxonomy; ?>-all"><?php echo $tax->labels->all_items; ?></a></li>
- <li class="hide-if-no-js"><a href="#<?php echo $taxonomy; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>
</del><ins>+ <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
+ <ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
+ <li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a></li>
+ <li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>
</ins><span class="cx"> </ul>
</span><span class="cx">
</span><del>- <div id="<?php echo $taxonomy; ?>-pop" class="tabs-panel" style="display: none;">
- <ul id="<?php echo $taxonomy; ?>checklist-pop" class="categorychecklist form-no-clear" >
- <?php $popular_ids = wp_popular_terms_checklist($taxonomy); ?>
</del><ins>+ <div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
+ <ul id="<?php echo $tax_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
+ <?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div id="<?php echo $taxonomy; ?>-all" class="tabs-panel">
</del><ins>+ <div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
</ins><span class="cx"> <?php
</span><del>- $name = ( $taxonomy == 'category' ) ? 'post_category' : 'tax_input[' . $taxonomy . ']';
</del><ins>+ $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
</ins><span class="cx"> echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
</span><span class="cx"> ?>
</span><del>- <ul id="<?php echo $taxonomy; ?>checklist" data-wp-lists="list:<?php echo $taxonomy?>" class="categorychecklist form-no-clear">
- <?php wp_terms_checklist($post->ID, array( 'taxonomy' => $taxonomy, 'popular_cats' => $popular_ids ) ) ?>
</del><ins>+ <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
+ <?php wp_terms_checklist( $post->ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><del>- <?php if ( current_user_can($tax->cap->edit_terms) ) : ?>
- <div id="<?php echo $taxonomy; ?>-adder" class="wp-hidden-children">
</del><ins>+ <?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
+ <div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">
</ins><span class="cx"> <h4>
</span><del>- <a id="<?php echo $taxonomy; ?>-add-toggle" href="#<?php echo $taxonomy; ?>-add" class="hide-if-no-js">
</del><ins>+ <a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js">
</ins><span class="cx"> <?php
</span><span class="cx"> /* translators: %s: add new taxonomy label */
</span><del>- printf( __( '+ %s' ), $tax->labels->add_new_item );
</del><ins>+ printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
</ins><span class="cx"> ?>
</span><span class="cx"> </a>
</span><span class="cx"> </h4>
</span><del>- <p id="<?php echo $taxonomy; ?>-add" class="category-add wp-hidden-child">
- <label class="screen-reader-text" for="new<?php echo $taxonomy; ?>"><?php echo $tax->labels->add_new_item; ?></label>
- <input type="text" name="new<?php echo $taxonomy; ?>" id="new<?php echo $taxonomy; ?>" 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="new<?php echo $taxonomy; ?>_parent">
- <?php echo $tax->labels->parent_item_colon; ?>
</del><ins>+ <p id="<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
+ <label class="screen-reader-text" for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
+ <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/>
+ <label class="screen-reader-text" for="new<?php echo $tax_name; ?>_parent">
+ <?php echo $taxonomy->labels->parent_item_colon; ?>
</ins><span class="cx"> </label>
</span><del>- <?php wp_dropdown_categories( array( 'taxonomy' => $taxonomy, 'hide_empty' => 0, 'name' => 'new'.$taxonomy.'_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '— ' . $tax->labels->parent_item . ' —' ) ); ?>
- <input type="button" id="<?php echo $taxonomy; ?>-add-submit" data-wp-lists="add:<?php echo $taxonomy ?>checklist:<?php echo $taxonomy ?>-add" class="button category-add-submit" value="<?php echo esc_attr( $tax->labels->add_new_item ); ?>" />
- <?php wp_nonce_field( 'add-'.$taxonomy, '_ajax_nonce-add-'.$taxonomy, false ); ?>
- <span id="<?php echo $taxonomy; ?>-ajax-response"></span>
</del><ins>+ <?php wp_dropdown_categories( array( 'taxonomy' => $tax_name, 'hide_empty' => 0, 'name' => 'new' . $tax_name . '_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '— ' . $taxonomy->labels->parent_item . ' —' ) ); ?>
+ <input type="button" id="<?php echo $tax_name; ?>-add-submit" data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add" class="button category-add-submit" value="<?php echo esc_attr( $taxonomy->labels->add_new_item ); ?>" />
+ <?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?>
+ <span id="<?php echo $tax_name; ?>-ajax-response"></span>
</ins><span class="cx"> </p>
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>