Changeset 12941

Timestamp:

02/04/2010 10:51:58 AM (15 years ago)

Author:

dd32

Message:

Migrate Category Edit UI hooks, Standardise on custom-taxonomies hooks, add custom-fields for taxonomies UI hooks. See #11838, Fixes #11191

Location:

trunk/wp-admin

Files:

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

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

@@ -20 +20 @@
 }
 
-do_action('edit_tag_form_pre', $tag); ?>
+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);  ?>
 
 <div class="wrap">
@@ -57 +61 @@
             <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
         </tr>
-        <?php do_action('edit_tag_form_fields', $tag); ?>
+        <?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);
+        ?>
     </table>
 <p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Tag'); ?>" /></p>
-<?php do_action('edit_tag_form', $tag); ?>
+<?php 
+if ( 'category' == $taxonomy ) 
+    do_action('edit_category_form_', $tag);
+else
+    do_action('edit_tag_form_', $tag);
+do_action('edit_' . $taxonomy . '_form', $tag, $taxonomy);
+?>
 </form>
 </div>

trunk/wp-admin/edit-tags.php

@@ -290 +290 @@
 
 <?php if ( current_user_can($tax->edit_cap) ) {
-    do_action('add_tag_form_pre', $taxonomy); ?>
+    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);
+?>
 
 <div class="form-wrap">
@@ -324 +329 @@
 </div>
 
+<?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);
+?>
+
 <p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php esc_attr_e('Add Tag'); ?>" /></p>
-<?php do_action('add_tag_form', $taxonomy); ?>
+<?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);
+?>
 </form></div>
 <?php } ?>