Changeset 36308

Timestamp:

01/15/2016 08:26:06 AM (9 years ago)

Author:

swissspidy

Message:

Taxonomy: Introduce wp-admin/term.php for editing single terms.

This is similar to edit.php -> post.php and users.php -> user-edit.php and fixes a bug where screen options for the list table were shown while editing a term.

Fixes #34988.

Location:

trunk/src

Files:

• wp-admin/edit-tag-form.php (modified) (3 diffs)
• wp-admin/edit-tags.php (modified) (1 diff)
• wp-admin/term.php (added)
• wp-includes/link-template.php (modified) (2 diffs)

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

@@ -8 +8 @@
 
 // don't load directly
-if ( !defined('ABSPATH') )
-    die('-1');
-
-if ( empty($tag_ID) ) { ?>
-<div class="wrap">
-    <h1><?php echo $tax->labels->edit_item; ?></h1>
-    <div id="message" class="notice notice-warning"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div>
-</div>
-<?php
-    return;
+if ( ! defined( 'ABSPATH' ) ) {
+    die( '-1' );
 }
 
@@ -58 +50 @@
 wp_reset_vars( array( 'wp_http_referer' ) );
 
-$wp_http_referer = remove_query_arg( array( 'action', 'message', 'tag_ID' ), $wp_http_referer );
+$wp_http_referer = remove_query_arg( array( 'action', 'message', 'term_id' ), $wp_http_referer );
 
 /** Also used by Edit Tags */
@@ -104 +96 @@
 do_action( "{$taxonomy}_term_edit_form_tag" );
 ?>>
-<input type="hidden" name="action" value="editedtag" />
-<input type="hidden" name="tag_ID" value="<?php echo esc_attr($tag->term_id) ?>" />
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy) ?>" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
+<input type="hidden" name="action" value="editedtag"/>
+<input type="hidden" name="tag_ID" value="<?php echo esc_attr( $term_id ) ?>"/>
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ) ?>"/>
+<?php
+wp_original_referer_field( true, 'previous' );
+wp_nonce_field( 'update-tag_' . $term_id );
+?>
     <table class="form-table">
         <tr class="form-field form-required term-name-wrap">

trunk/src/wp-admin/edit-tags.php

@@ -151 +151 @@
 
 case 'edit':
-    $title = $tax->labels->edit_item;
-
     if ( ! isset( $_REQUEST['tag_ID'] ) ) {
         break;
     }
 
-    $tag_ID = (int) $_REQUEST['tag_ID'];
-
-    $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
-    if ( ! $tag )
+    $term_id = (int) $_REQUEST['tag_ID'];
+    $term    = get_term( $term_id );
+
+    if ( ! $term instanceof WP_Term ) {
         wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
-    require_once( ABSPATH . 'wp-admin/admin-header.php' );
-    include( ABSPATH . 'wp-admin/edit-tag-form.php' );
-    include( ABSPATH . 'wp-admin/admin-footer.php' );
-
+    }
+
+    wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
     exit;
 

trunk/src/wp-includes/link-template.php

@@ -927 +927 @@
 
     $args = array(
-        'action' => 'edit',
         'taxonomy' => $taxonomy,
-        'tag_ID' => $term->term_id,
+        'term_id'  => $term->term_id,
     );
 
@@ -939 +938 @@
 
     if ( $tax->show_ui ) {
-        $location = add_query_arg( $args, admin_url( 'edit-tags.php' ) );
+        $location = add_query_arg( $args, admin_url( 'term.php' ) );
     } else {
         $location = '';