diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-12 15:03:18 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-12 15:03:18 +0000 |
| commit | 1980c948464d909b6f6893c1d7df4087789cf2be (patch) | |
| tree | 54c28594225a44025c868cdd9f94daaaad33ab6a /wp-includes | |
| parent | 08e516d87f90728070af0a6e9182e8457e8d1543 (diff) | |
| download | wordpress-mu-1980c948464d909b6f6893c1d7df4087789cf2be.tar.gz wordpress-mu-1980c948464d909b6f6893c1d7df4087789cf2be.tar.xz wordpress-mu-1980c948464d909b6f6893c1d7df4087789cf2be.zip | |
Must use site_id in sitemeta queries and caching
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@913 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
| -rw-r--r-- | wp-includes/wpmu-functions.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php index abd3d47..55aef90 100644 --- a/wp-includes/wpmu-functions.php +++ b/wp-includes/wpmu-functions.php @@ -227,19 +227,19 @@ function is_site_admin( $user_login = false ) { return false; } -function get_site_option( $option, $default = false, $use_cache = true ) { +function get_site_option( $key, $default = false, $use_cache = true ) { global $wpdb; if( $use_cache == true ) { - $value = wp_cache_get($option, 'site-options'); + $value = wp_cache_get($wpdb->siteid . $key, 'site-options'); } else { $value = false; } if ( false === $value ) { - $value = $wpdb->get_var("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = '$option' AND site_id = '$wpdb->siteid'"); + $value = $wpdb->get_var("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = '$key' AND site_id = '{$wpdb->siteid}'"); if ( ! is_null($value) ) { - wp_cache_set($option, $value, 'site-options'); + wp_cache_set($wpdb->siteid . $key, $value, 'site-options'); } elseif ( $default ) { return $default; } else { @@ -266,8 +266,8 @@ function add_site_option( $key, $value ) { if ( is_array($value) || is_object($value) ) $value = serialize($value); $value = $wpdb->escape( $value ); - wp_cache_delete($key, 'site-options'); - $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id , meta_key , meta_value ) VALUES ( '$wpdb->siteid', '$key', '$value')" ); + wp_cache_delete($wpdb->siteid . $key, 'site-options'); + $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id , meta_key , meta_value ) VALUES ( '{$wpdb->siteid}', '$key', '$value')" ); return $wpdb->insert_id; } @@ -284,8 +284,8 @@ function update_site_option( $key, $value ) { if ( get_site_option( $key, false, false ) == false ) add_site_option( $key, $value ); - $wpdb->query( "UPDATE $wpdb->sitemeta SET meta_value = '".$wpdb->escape( $value )."' WHERE meta_key = '$key'" ); - wp_cache_delete( $key, 'site-options' ); + $wpdb->query( "UPDATE $wpdb->sitemeta SET meta_value = '".$wpdb->escape( $value )."' WHERE site_id='{$wpdb->siteid}' AND meta_key = '$key'" ); + wp_cache_delete( $wpdb->siteid . $key, 'site-options' ); } function get_blog_option( $id, $key, $default='na' ) { |