Ticket #34988: 34988.5.diff

src/wp-admin/admin.php

@@ -355 +355 @@
                         do_action( 'load-categories.php' );
                 elseif ( $taxnow == 'link_category' )
                         do_action( 'load-edit-link-categories.php' );
+        } elseif( 'term.php' === $pagenow ) {
+                do_action( 'edit-tags.php' );
         }
 }
 

src/wp-admin/includes/class-wp-screen.php

@@ -304 +304 @@
                                         }
                                         break;
                                 case 'edit-tags' :
+                                case 'term' :
                                         if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
                                                 $post_type = 'post';
                                         break;
@@ -322 +323 @@
                                 $id .= '-' . $post_type;
                                 break;
                         case 'edit-tags' :
+                        case 'term' :
                                 if ( null === $taxonomy )
                                         $taxonomy = 'post_tag';
                                 // The edit-tags ID does not contain the post type. Look for it in the request.

src/wp-admin/term.php

@@ -10 +10 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( empty( $_REQUEST['term_id'] ) ) {
+if ( empty( $_REQUEST['tag_ID'] ) ) {
         $sendback = admin_url( 'edit-tags.php' );
         if ( ! empty( $taxnow ) ) {
                 $sendback = add_query_arg( array( 'taxonomy' => $taxnow ), $sendback );
@@ -19 +19 @@
         exit;
 }
 
-$term_id = absint( $_REQUEST['term_id'] );
-$tag    = get_term( $term_id, $taxnow, OBJECT, 'edit' );
+$term_id = absint( $_REQUEST['tag_ID'] );
+$tag     = get_term( $term_id, '', OBJECT, 'edit' );
 
 if ( ! $tag instanceof WP_Term ) {
         wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );

src/wp-includes/admin-bar.php

@@ -573 +573 @@
                                         'href' => get_permalink( $post->ID )
                                 ) );
                         }
-                } elseif ( 'edit-tags' == $current_screen->base
+                } elseif ( 'term' == $current_screen->base
                         && isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag )
                         && ( $tax = get_taxonomy( $tag->taxonomy ) )
                         && $tax->public )

src/wp-includes/link-template.php

@@ -928 +928 @@
 
         $args = array(
                 'taxonomy' => $taxonomy,
-                'term_id'  => $term->term_id,
+                'tag_ID'   => $term->term_id,
         );
 
         if ( $object_type ) {

tests/phpunit/tests/post.php

@@ -991 +991 @@
                 $term = reset( $terms );
 
                 foreach ( $matches[1] as $url ) {
-                        $this->assertContains( 'term_id=' . $term->term_id, $url );
+                        $this->assertContains( 'tag_ID=' . $term->term_id, $url );
                         $this->assertContains( 'post_type=new_post_type', $url );
                 }
         }

tests/phpunit/tests/term/getEditTermLink.php

@@ -17 +17 @@
                 ) );
 
                 $actual = get_edit_term_link( $term1, 'wptests_tax' );
-                $expected = 'http://' . WP_TESTS_DOMAIN . '/wp-admin/term.php?taxonomy=wptests_tax&term_id=' . $term1 . '&post_type=post';
+                $expected = 'http://' . WP_TESTS_DOMAIN . '/wp-admin/term.php?taxonomy=wptests_tax&tag_ID=' . $term1 . '&post_type=post';
                 $this->assertEquals( $expected, $actual );
         }