Changeset 13158

Timestamp:

02/14/2010 11:30:31 PM (17 years ago)

Author:

nacin

Message:

Fix var name conflict in delete_site_option(), see #10788

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -3480 +3480 @@
                 $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";