<!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>[13035] trunk/wp-admin:
Rename new taxonomy page hooks to prevent hook conflicts.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13035">13035</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-09 10:56:39 +0000 (Tue, 09 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename new taxonomy page hooks to prevent hook conflicts. See <a href="http://trac.wordpress.org/ticket/12171">#12171</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 (13034 => 13035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tag-form.php 2010-02-09 00:07:52 UTC (rev 13034)
+++ trunk/wp-admin/edit-tag-form.php 2010-02-09 10:56:39 UTC (rev 13035)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> do_action('edit_category_form_pre', $tag );
</span><span class="cx"> else
</span><span class="cx"> do_action('edit_tag_form_pre', $tag);
</span><del>-do_action('edit_' . $taxonomy . '_form_pre', $tag, $taxonomy); ?>
</del><ins>+do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="lines">@@ -65,16 +65,16 @@
</span><span class="cx"> do_action('edit_category_form_fields', $tag);
</span><span class="cx"> else
</span><span class="cx"> do_action('edit_tag_form_fields', $tag);
</span><del>- do_action('edit_' . $taxonomy . '_form_fields', $tag, $taxonomy);
</del><ins>+ do_action($taxonomy . '_edit_form_fields', $tag, $taxonomy);
</ins><span class="cx"> ?>
</span><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><span class="cx"> <?php
</span><span class="cx"> if ( 'category' == $taxonomy )
</span><del>- do_action('edit_category_form_', $tag);
</del><ins>+ do_action('edit_category_form', $tag);
</ins><span class="cx"> else
</span><del>- do_action('edit_tag_form_', $tag);
-do_action('edit_' . $taxonomy . '_form', $tag, $taxonomy);
</del><ins>+ do_action('edit_tag_form', $tag);
+do_action($taxonomy . '_edit_form', $tag, $taxonomy);
</ins><span class="cx"> ?>
</span><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 (13034 => 13035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-02-09 00:07:52 UTC (rev 13034)
+++ trunk/wp-admin/edit-tags.php 2010-02-09 10:56:39 UTC (rev 13035)
</span><span class="lines">@@ -290,10 +290,10 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( current_user_can($tax->edit_cap) ) {
</span><span class="cx"> if ( 'category' == $taxonomy )
</span><del>- do_action('add_category_form_pre', (object)array('parent' => 0) );
</del><ins>+ do_action('add_category_form_pre', (object)array('parent' => 0) ); // Back compat hook. Deprecated in preference to $taxonomy_pre_add_form
</ins><span class="cx"> else
</span><del>- do_action('add_tag_form_pre', $taxonomy);
- do_action('add_' . $taxonomy . '_form_pre', $taxonomy);
</del><ins>+ do_action('add_tag_form_pre', $taxonomy); // Back compat hook. Applies to all Taxonomies -not- categories
+ do_action($taxonomy . '_pre_add_form', $taxonomy);
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="form-wrap">
</span><span class="lines">@@ -328,21 +328,19 @@
</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><del>-<?php
-if ( 'category' == $taxonomy )
- do_action('add_category_form_fields');
-else
</del><ins>+<?php
+if ( ! is_taxonomy_hierarchical($taxonomy) )
</ins><span class="cx"> do_action('add_tag_form_fields', $taxonomy);
</span><del>-do_action('add_' . $taxonomy . '_form_fields', $taxonomy);
</del><ins>+do_action($taxonomy . '_add_form_fields', $taxonomy);
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
</span><span class="cx"> <?php
</span><span class="cx"> if ( 'category' == $taxonomy )
</span><del>- do_action('edit_category_form', (object)array('parent' => 0) );
</del><ins>+ do_action('edit_category_form', (object)array('parent' => 0) ); // Back compat hook. Deprecated in preference to $taxonomy_add_form
</ins><span class="cx"> else
</span><del>- do_action('add_tag_form', $taxonomy);
-do_action('add_' . $taxonomy . '_form', $taxonomy);
</del><ins>+ do_action('add_tag_form', $taxonomy); // Back compat hook. Applies to all Taxonomies -not- categories
+do_action($taxonomy . '_add_form', $taxonomy);
</ins><span class="cx"> ?>
</span><span class="cx"> </form></div>
</span><span class="cx"> <?php } ?>
</span></span></pre>
</div>
</div>
</body>
</html>