<!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>[14978] trunk/wp-admin: Revert [14853], [14778], returning tag/
cat converter to tools.php and edit-tags.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14978">14978</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-27 04:35:11 +0000 (Thu, 27 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.wordpress.org/changeset/14853">[14853]</a>, <a href="http://trac.wordpress.org/changeset/14778">[14778]</a>, returning tag/cat converter to tools.php and edit-tags.php. Link to import.php instead of the converter directly as it may not be installed. see <a href="http://trac.wordpress.org/ticket/13566">#13566</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadmintoolsphp">trunk/wp-admin/tools.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (14977 => 14978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-05-27 04:19:23 UTC (rev 14977)
+++ trunk/wp-admin/edit-tags.php 2010-05-27 04:35:11 UTC (rev 14978)
</span><span class="lines">@@ -338,7 +338,12 @@
</span><span class="cx"> <?php if ( 'category' == $taxonomy ) : ?>
</span><span class="cx"> <div class="form-wrap">
</span><span class="cx"> <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
</span><ins>+<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'import.php') ?></p>
</ins><span class="cx"> </div>
</span><ins>+<?php elseif ( 'post_tag' == $taxonomy ) : ?>
+<div class="form-wrap">
+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'import.php') ;?>.</p>
+</div>
</ins><span class="cx"> <?php endif;
</span><span class="cx"> do_action('after-' . $taxonomy . '-table', $taxonomy);
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadmintoolsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/tools.php (14977 => 14978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/tools.php 2010-05-27 04:19:23 UTC (rev 14977)
+++ trunk/wp-admin/tools.php 2010-05-27 04:35:11 UTC (rev 14978)
</span><span class="lines">@@ -37,6 +37,17 @@
</span><span class="cx"> <?php
</span><span class="cx"> endif;
</span><span class="cx">
</span><ins>+$cats = get_taxonomy('category');
+$tags = get_taxonomy('post_tag');
+
+if ( current_user_can($cats->cap->manage_terms) || current_user_can($tags->cap->manage_terms) ) : ?>
+<div class="tool-box">
+ <h3 class="title"><?php _e( 'Categories and Tags Converter' ) ?></h3>
+ <p><?php printf( __('<a href="%s">Use this</a> to convert categories to tags or tags to categories</a>.'), 'import.php' ); ?></p>
+</div>
+<?php
+endif;
+
</ins><span class="cx"> do_action( 'tool_box' );
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>