From 40741408ecb59140a4eebefcdb474c4202b0b26e Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Sat, 16 Jul 2016 18:37:30 +0000 Subject: [PATCH] On term.php, use `$taxnow` when fetching currently edited term. [36874] changed the `get_term()` call so that no `$taxonomy` parameter was passed, as 4.4 made the parameter optional. This change made it impossible to access a shared term that has not yet been splitr, since passing an ambiguous `$term_id` to `get_term()` results in an error. Restoring the `$taxonomy` parameter fixes the regression. Props alleynoah, dlh. Fixes #37205. Built from https://develop.svn.wordpress.org/trunk@38069 git-svn-id: http://core.svn.wordpress.org/trunk@38010 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/term.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/term.php b/wp-admin/term.php index 5e621d77df..dc3f1d5fef 100644 --- a/wp-admin/term.php +++ b/wp-admin/term.php @@ -20,7 +20,7 @@ if ( empty( $_REQUEST['tag_ID'] ) ) { } $tag_ID = absint( $_REQUEST['tag_ID'] ); -$tag = get_term( $tag_ID, '', OBJECT, 'edit' ); +$tag = get_term( $tag_ID, $taxnow, OBJECT, 'edit' ); if ( ! $tag instanceof WP_Term ) { wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 0a04b36b19..4e0eac728f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-beta3-38068'; +$wp_version = '4.6-beta3-38069'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.