wp-includes/option.php | 80 +++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/wp-includes/option.php b/wp-includes/option.php
index 1b5dde2..c7ec6bf 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -613,28 +613,24 @@ function get_transient( $transient ) {
 	if ( false !== $pre )
 		return $pre;
 
-	if ( wp_using_ext_object_cache() ) {
-		$value = wp_cache_get( $transient, 'transient' );
-	} else {
-		$transient_option = '_transient_' . $transient;
-		if ( ! defined( 'WP_INSTALLING' ) ) {
-			// If option is not in alloptions, it is not autoloaded and thus has a timeout
-			$alloptions = wp_load_alloptions();
-			if ( !isset( $alloptions[$transient_option] ) ) {
-				$transient_timeout = '_transient_timeout_' . $transient;
-				$timeout = get_option( $transient_timeout );
-				if ( false !== $timeout && $timeout < time() ) {
-					delete_option( $transient_option  );
-					delete_option( $transient_timeout );
-					$value = false;
-				}
+	$transient_option = '_transient_' . $transient;
+	if ( ! defined( 'WP_INSTALLING' ) ) {
+		// If option is not in alloptions, it is not autoloaded and thus has a timeout
+		$alloptions = wp_load_alloptions();
+		if ( !isset( $alloptions[$transient_option] ) ) {
+			$transient_timeout = '_transient_timeout_' . $transient;
+			$timeout = get_option( $transient_timeout );
+			if ( false !== $timeout && $timeout < time() ) {
+				delete_option( $transient_option  );
+				delete_option( $transient_timeout );
+				$value = false;
 			}
 		}
-
-		if ( ! isset( $value ) )
-			$value = get_option( $transient_option );
 	}
 
+	if ( ! isset( $value ) )
+		$value = get_option( $transient_option );
+
 	/**
 	 * Filter an existing transient's value.
 	 *
@@ -679,35 +675,31 @@ function set_transient( $transient, $value, $expiration = 0 ) {
 	 */
 	$value = apply_filters( 'pre_set_transient_' . $transient, $value, $expiration );
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_set( $transient, $value, 'transient', $expiration );
+	$transient_timeout = '_transient_timeout_' . $transient;
+	$transient = '_transient_' . $transient;
+	if ( false === get_option( $transient ) ) {
+		$autoload = 'yes';
+		if ( $expiration ) {
+			$autoload = 'no';
+			add_option( $transient_timeout, time() + $expiration, '', 'no' );
+		}
+		$result = add_option( $transient, $value, '', $autoload );
 	} else {
-		$transient_timeout = '_transient_timeout_' . $transient;
-		$transient = '_transient_' . $transient;
-		if ( false === get_option( $transient ) ) {
-			$autoload = 'yes';
-			if ( $expiration ) {
-				$autoload = 'no';
+		// 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 );
 				add_option( $transient_timeout, time() + $expiration, '', 'no' );
+				$result = add_option( $transient, $value, '', 'no' );
+				$update = false;
+			} else {
+				update_option( $transient_timeout, time() + $expiration );
 			}
-			$result = add_option( $transient, $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 );
-					add_option( $transient_timeout, time() + $expiration, '', 'no' );
-					$result = add_option( $transient, $value, '', 'no' );
-					$update = false;
-				} else {
-					update_option( $transient_timeout, time() + $expiration );
-				}
-			}
-			if ( $update ) {
-				$result = update_option( $transient, $value );
-			}
+		}
+		if ( $update ) {
+			$result = update_option( $transient, $value );
 		}
 	}