Changeset 13035

Timestamp:

02/09/2010 10:56:39 AM (17 years ago)

Author:

dd32

Message:

Rename new taxonomy page hooks to prevent hook conflicts. See #12171

Location:

trunk/wp-admin

Files:

• edit-tag-form.php (modified) (3 diffs)
• edit-tags.php (modified) (2 diffs)

trunk/wp-admin/edit-tag-form.php

@@ -24 +24 @@
 else
         do_action('edit_tag_form_pre', $tag);
-do_action('edit_' . $taxonomy . '_form_pre', $tag, $taxonomy);  ?>
+do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy);  ?>
 
 <div class="wrap">
@@ -66 +66 @@
                 else
                         do_action('edit_tag_form_fields', $tag);
-                do_action('edit_' . $taxonomy . '_form_fields', $tag, $taxonomy);
+                do_action($taxonomy . '_edit_form_fields', $tag, $taxonomy);
                 ?>
         </table>
@@ -72 +72 @@
 <?php
 if ( 'category' == $taxonomy )
-        do_action('edit_category_form_', $tag);
+        do_action('edit_category_form', $tag);
 else
-        do_action('edit_tag_form_', $tag);
-do_action('edit_' . $taxonomy . '_form', $tag, $taxonomy);
+        do_action('edit_tag_form', $tag);
+do_action($taxonomy . '_edit_form', $tag, $taxonomy);
 ?>
 </form>

trunk/wp-admin/edit-tags.php

@@ -291 +291 @@
 <?php if ( current_user_can($tax->edit_cap) ) {
         if ( 'category' == $taxonomy )
-                do_action('add_category_form_pre', (object)array('parent' => 0) );
+                do_action('add_category_form_pre', (object)array('parent' => 0) );  // Back compat hook. Deprecated in preference to $taxonomy_pre_add_form
         else
-                do_action('add_tag_form_pre', $taxonomy);
-        do_action('add_' . $taxonomy . '_form_pre', $taxonomy);
+                do_action('add_tag_form_pre', $taxonomy); // Back compat hook. Applies to all Taxonomies -not- categories
+        do_action($taxonomy . '_pre_add_form', $taxonomy);
 ?>
 
@@ -329 +329 @@
 </div>
 
+<?php 
+if ( ! is_taxonomy_hierarchical($taxonomy) ) 
+        do_action('add_tag_form_fields', $taxonomy);
+do_action($taxonomy . '_add_form_fields', $taxonomy);
+?>
+
+<p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
 <?php
 if ( 'category' == $taxonomy )
-        do_action('add_category_form_fields');
+        do_action('edit_category_form', (object)array('parent' => 0) );  // Back compat hook. Deprecated in preference to $taxonomy_add_form
 else
-        do_action('add_tag_form_fields', $taxonomy);
-do_action('add_' . $taxonomy . '_form_fields', $taxonomy);
-?>
-
-<p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
-<?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);
+        do_action('add_tag_form', $taxonomy); // Back compat hook. Applies to all Taxonomies -not- categories
+do_action($taxonomy . '_add_form', $taxonomy);
 ?>
 </form></div>