WordPress.org

Make WordPress Core


Ignore:
Timestamp:
02/14/2010 11:30:31 PM (8 years ago)
Author:
nacin
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/functions.php

    r13151 r13158  
    34803480        $result = delete_option( $option );
    34813481    } else {
    3482         $option = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
    3483         if ( is_null( $option ) || !$option->meta_id )
     3482        $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
     3483        if ( is_null( $row ) || !$row->meta_id )
    34843484            return false;
    34853485        $cache_key = "{$wpdb->siteid}:$option";
Note: See TracChangeset for help on using the changeset viewer.