<!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>[15336] trunk/wp-admin: Make Categories/Tags columns on edit.
php properly aware of post types.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15336">15336</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-27 01:05:53 +0000 (Sun, 27 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make Categories/Tags columns on edit.php properly aware of post types. Also ensure AJAX add-tag on edit-tags.php is given the post type. fixes <a href="http://trac.wordpress.org/ticket/14061">#14061</a> for trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.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="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (15335 => 15336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-06-26 07:13:07 UTC (rev 15335)
+++ trunk/wp-admin/admin-ajax.php 2010-06-27 01:05:53 UTC (rev 15336)
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'add-tag' : // From Manage->Tags
</span><span class="cx"> check_ajax_referer( 'add-tag' );
</span><del>-
</del><ins>+ $post_type = !empty($_POST['post_type']) ? $_POST['post_type'] : 'post';
</ins><span class="cx"> $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
</span><span class="cx"> $tax = get_taxonomy($taxonomy);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (15335 => 15336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-06-26 07:13:07 UTC (rev 15335)
+++ trunk/wp-admin/edit-tags.php 2010-06-27 01:05:53 UTC (rev 15336)
</span><span class="lines">@@ -382,6 +382,7 @@
</span><span class="cx"> <input type="hidden" name="action" value="add-tag" />
</span><span class="cx"> <input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
</span><span class="cx"> <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
</span><ins>+<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
</ins><span class="cx"> <?php wp_nonce_field('add-tag'); ?>
</span><span class="cx">
</span><span class="cx"> <div class="form-field form-required">
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (15335 => 15336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-06-26 07:13:07 UTC (rev 15335)
+++ trunk/wp-admin/includes/template.php 2010-06-27 01:05:53 UTC (rev 15336)
</span><span class="lines">@@ -1389,7 +1389,7 @@
</span><span class="cx"> if ( !empty( $categories ) ) {
</span><span class="cx"> $out = array();
</span><span class="cx"> foreach ( $categories as $c )
</span><del>- $out[] = "<a href='edit.php?category_name=$c->slug'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . '</a>';
</del><ins>+ $out[] = "<a href='edit.php?post_type={$post->post_type}&amp;category_name={$c->slug}'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . '</a>';
</ins><span class="cx"> echo join( ', ', $out );
</span><span class="cx"> } else {
</span><span class="cx"> _e('Uncategorized');
</span><span class="lines">@@ -1405,7 +1405,7 @@
</span><span class="cx"> if ( !empty( $tags ) ) {
</span><span class="cx"> $out = array();
</span><span class="cx"> foreach ( $tags as $c )
</span><del>- $out[] = "<a href='edit.php?tag=$c->slug'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . '</a>';
</del><ins>+ $out[] = "<a href='edit.php?post_type={$post->post_type}&amp;tag={$c->slug}'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . '</a>';
</ins><span class="cx"> echo join( ', ', $out );
</span><span class="cx"> } else {
</span><span class="cx"> _e('No Tags');
</span></span></pre>
</div>
</div>
</body>
</html>