Changeset 36874

Timestamp:

03/07/2016 12:55:04 PM (9 years ago)

Author:

swissspidy

Message:

Taxonomy: Improve backward compatibility on the wp-admin/term.php page.

Specifically, run do_action( 'edit-tags.php' ); on this new term edit page introduced in [36308]. Changes the GET param back to tag_ID and properly sets the screen base in WP_Screen.

See #34988.

Location:

trunk

Files:

• src/wp-admin/admin.php (modified) (1 diff)
• src/wp-admin/includes/class-wp-screen.php (modified) (2 diffs)
• src/wp-admin/term.php (modified) (2 diffs)
• src/wp-includes/admin-bar.php (modified) (1 diff)
• src/wp-includes/link-template.php (modified) (1 diff)
• tests/phpunit/tests/post.php (modified) (1 diff)
• tests/phpunit/tests/term/getEditTermLink.php (modified) (1 diff)

trunk/src/wp-admin/admin.php

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

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

@@ -305 +305 @@
                     break;
                 case 'edit-tags' :
+                case 'term' :
                     if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
                         $post_type = 'post';
@@ -323 +324 @@
                 break;
             case 'edit-tags' :
+            case 'term' :
                 if ( null === $taxonomy )
                     $taxonomy = 'post_tag';

trunk/src/wp-admin/term.php

@@ -11 +11 @@
 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 ) ) {
@@ -20 +20 @@
 }
 
-$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 ) {

trunk/src/wp-includes/admin-bar.php

@@ -574 +574 @@
                 ) );
             }
-        } 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 ) )

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

@@ -929 +929 @@
     $args = array(
         'taxonomy' => $taxonomy,
-        'term_id'  => $term->term_id,
+        'tag_ID'   => $term->term_id,
     );
 

trunk/tests/phpunit/tests/post.php

@@ -992 +992 @@
 
         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 );
         }

trunk/tests/phpunit/tests/term/getEditTermLink.php

@@ -18 +18 @@
 
         $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 );
     }