<!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>[12941] trunk/wp-admin: Migrate Category Edit UI hooks,
Standardise on custom-taxonomies hooks,
add custom-fields for taxonomies UI hooks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12941">12941</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-04 10:51:58 +0000 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Migrate Category Edit UI hooks, Standardise on custom-taxonomies hooks, add custom-fields for taxonomies UI hooks. See <a href="http://trac.wordpress.org/ticket/11838">#11838</a>, Fixes <a href="http://trac.wordpress.org/ticket/11191">#11191</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminedittagformphp">trunk/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminedittagformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tag-form.php (12940 => 12941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tag-form.php 2010-02-03 23:06:27 UTC (rev 12940)
+++ trunk/wp-admin/edit-tag-form.php 2010-02-04 10:51:58 UTC (rev 12941)
</span><span class="lines">@@ -19,7 +19,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-do_action('edit_tag_form_pre', $tag); ?>
</del><ins>+if ( 'category' == $taxonomy )
+ do_action('edit_category_form_pre', $tag );
+else
+ do_action('edit_tag_form_pre', $tag);
+do_action('edit_' . $taxonomy . '_form_pre', $tag, $taxonomy); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="lines">@@ -56,9 +60,21 @@
</span><span class="cx"> <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo esc_html($tag->description); ?></textarea><br />
</span><span class="cx"> <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
</span><span class="cx"> </tr>
</span><del>- <?php do_action('edit_tag_form_fields', $tag); ?>
</del><ins>+ <?php
+ if ( 'category' == $taxonomy )
+ do_action('edit_category_form_fields', $tag);
+ else
+ do_action('edit_tag_form_fields', $tag);
+ do_action('edit_' . $taxonomy . '_form_fields', $tag, $taxonomy);
+ ?>
</ins><span class="cx"> </table>
</span><span class="cx"> <p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Tag'); ?>" /></p>
</span><del>-<?php do_action('edit_tag_form', $tag); ?>
</del><ins>+<?php
+if ( 'category' == $taxonomy )
+ do_action('edit_category_form_', $tag);
+else
+ do_action('edit_tag_form_', $tag);
+do_action('edit_' . $taxonomy . '_form', $tag, $taxonomy);
+?>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (12940 => 12941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-02-03 23:06:27 UTC (rev 12940)
+++ trunk/wp-admin/edit-tags.php 2010-02-04 10:51:58 UTC (rev 12941)
</span><span class="lines">@@ -289,7 +289,12 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php if ( current_user_can($tax->edit_cap) ) {
</span><del>- do_action('add_tag_form_pre', $taxonomy); ?>
</del><ins>+ if ( 'category' == $taxonomy )
+ do_action('add_category_form_pre', (object)array('parent' => 0) );
+ else
+ do_action('add_tag_form_pre', $taxonomy);
+ do_action('add_' . $taxonomy . '_form_pre', $taxonomy);
+?>
</ins><span class="cx">
</span><span class="cx"> <div class="form-wrap">
</span><span class="cx"> <h3><?php _e('Add a New Tag'); ?></h3>
</span><span class="lines">@@ -323,8 +328,22 @@
</span><span class="cx"> <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+<?php
+if ( 'category' == $taxonomy )
+ do_action('add_category_form_fields');
+else
+ do_action('add_tag_form_fields', $taxonomy);
+do_action('add_' . $taxonomy . '_form_fields', $taxonomy);
+?>
+
</ins><span class="cx"> <p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
</span><del>-<?php do_action('add_tag_form', $taxonomy); ?>
</del><ins>+<?php
+if ( 'category' == $taxonomy )
+ do_action('edit_category_form', (object)array('parent' => 0) );
+else
+ do_action('add_tag_form', $taxonomy);
+do_action('add_' . $taxonomy . '_form', $taxonomy);
+?>
</ins><span class="cx"> </form></div>
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>