From 9462ab0576c26f841df28e895fe10a9e2f963f4a Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Fri, 11 Mar 2016 08:52:29 +0000
Subject: [PATCH] Taxonomy: After [36874], rename `$term_id` to `$tag_ID` in
 `wp-admin/edit-tag-form.php`.

This ensures that no variables changed in the process of introducing `wp-admin/term.php`, improving overall backward compatibility.

Props Chouby for initial patch.
Fixes #34988.
Built from https://develop.svn.wordpress.org/trunk@36969


git-svn-id: http://core.svn.wordpress.org/trunk@36937 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-tag-form.php | 6 +++---
 wp-admin/term.php          | 4 ++--
 wp-includes/version.php    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index 6a4500b565..a50685efbf 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -49,7 +49,7 @@ if ( 'category' == $taxonomy ) {
  */
 wp_reset_vars( array( 'wp_http_referer' ) );
 
-$wp_http_referer = remove_query_arg( array( 'action', 'message', 'term_id' ), $wp_http_referer );
+$wp_http_referer = remove_query_arg( array( 'action', 'message', 'tag_ID' ), $wp_http_referer );
 
 /** Also used by Edit Tags */
 require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' );
@@ -96,11 +96,11 @@ do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
 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( $term_id ) ?>"/>
+<input type="hidden" name="tag_ID" value="<?php echo esc_attr( $tag_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 );
+wp_nonce_field( 'update-tag_' . $tag_ID );
 
 /**
  * Fires at the beginning of the Edit Term form.
diff --git a/wp-admin/term.php b/wp-admin/term.php
index 5454874537..d5417321f6 100644
--- a/wp-admin/term.php
+++ b/wp-admin/term.php
@@ -19,8 +19,8 @@ if ( empty( $_REQUEST['tag_ID'] ) ) {
 	exit;
 }
 
-$term_id = absint( $_REQUEST['tag_ID'] );
-$tag     = get_term( $term_id, '', OBJECT, 'edit' );
+$tag_ID = absint( $_REQUEST['tag_ID'] );
+$tag    = get_term( $tag_ID, '', OBJECT, 'edit' );
 
 if ( ! $tag instanceof WP_Term ) {
 	wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5cc459f39e..901f52fd1d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-beta3-36968';
+$wp_version = '4.5-beta3-36969';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.