From c95a891437072013c6f48fa3d45a56afb115a7fa Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sun, 14 Feb 2010 23:30:31 +0000 Subject: [PATCH] Fix var name conflict in delete_site_option(), see #10788 git-svn-id: https://develop.svn.wordpress.org/trunk@13158 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index b01903f30e..5ccf254407 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -3479,8 +3479,8 @@ function delete_site_option( $option ) { if ( !is_multisite() ) { $result = delete_option( $option ); } else { - $option = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) ); - if ( is_null( $option ) || !$option->meta_id ) + $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) ); + if ( is_null( $row ) || !$row->meta_id ) return false; $cache_key = "{$wpdb->siteid}:$option"; wp_cache_delete( $cache_key, 'site-options' );