WordPress 4.5

[autoinstalls/wordpress.git] / wp-admin / edit-tags.php

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 6ff9e3741968ad23d647c49e59da4a8184636e15..b953da683a87e2e7b2be3c50633a25cf2d1aa471 100644 (file)
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -150,17 +150,18 @@ case 'bulk-delete':
        break;
 
 case 'edit':
-       $title = $tax->labels->edit_item;
+       if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+               break;
+       }
 
-       $tag_ID = (int) $_REQUEST['tag_ID'];
+       $term_id = (int) $_REQUEST['tag_ID'];
+       $term    = get_term( $term_id );
 
-       $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
-       if ( ! $tag )
+       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;
 
 case 'editedtag':
@@ -307,8 +308,11 @@ if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) {
 
 <div class="wrap nosubsub">
 <h1><?php echo esc_html( $title );
-if ( !empty($_REQUEST['s']) )
-       printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+       /* translators: %s: search keywords */
+       printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( wp_unslash( $_REQUEST['s'] ) ) );
+}
+?>
 </h1>
 
 <?php if ( $message ) : ?>