From 1b0bc28579c18f31ac5ceb4eec6b924423cd017f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 29 Oct 2015 11:52:28 +0000
Subject: [PATCH] Rename internal variable in `set_transient()`.

The previous name was inadvertently changing the dynamic part of `set_transient_{transient}` action and the transient name passed to the action since [35082].

Props GregLone.
Fixes #34470.
Built from https://develop.svn.wordpress.org/trunk@35431


git-svn-id: http://core.svn.wordpress.org/trunk@35395 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/option.php  | 12 ++++++------
 wp-includes/version.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wp-includes/option.php b/wp-includes/option.php
index 760d5d91f9..6d9fe645c6 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -712,30 +712,30 @@ function set_transient( $transient, $value, $expiration = 0 ) {
 		$result = wp_cache_set( $transient, $value, 'transient', $expiration );
 	} else {
 		$transient_timeout = '_transient_timeout_' . $transient;
-		$transient = '_transient_' . $transient;
-		if ( false === get_option( $transient ) ) {
+		$transient_option = '_transient_' . $transient;
+		if ( false === get_option( $transient_option ) ) {
 			$autoload = 'yes';
 			if ( $expiration ) {
 				$autoload = 'no';
 				add_option( $transient_timeout, time() + $expiration, '', 'no' );
 			}
-			$result = add_option( $transient, $value, '', $autoload );
+			$result = add_option( $transient_option, $value, '', $autoload );
 		} else {
 			// If expiration is requested, but the transient has no timeout option,
 			// delete, then re-create transient rather than update.
 			$update = true;
 			if ( $expiration ) {
 				if ( false === get_option( $transient_timeout ) ) {
-					delete_option( $transient );
+					delete_option( $transient_option );
 					add_option( $transient_timeout, time() + $expiration, '', 'no' );
-					$result = add_option( $transient, $value, '', 'no' );
+					$result = add_option( $transient_option, $value, '', 'no' );
 					$update = false;
 				} else {
 					update_option( $transient_timeout, time() + $expiration );
 				}
 			}
 			if ( $update ) {
-				$result = update_option( $transient, $value );
+				$result = update_option( $transient_option, $value );
 			}
 		}
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 64bf9ce701..7dedec42aa 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta2-35430';
+$wp_version = '4.4-beta2-35431';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.