diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-02-05 11:49:12 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-02-05 11:49:12 +0000 |
| commit | 6ef7b48c2da1ad9731e1f4734be86ed3ae5afca0 (patch) | |
| tree | 0a0c0a8c8146ef18a1aa87016c9a3f7e3ced1618 /wp-includes/cache.php | |
| parent | 4c4e0fc82e70e810472721ad23aac64ba2c5b6e1 (diff) | |
| download | wordpress-mu-6ef7b48c2da1ad9731e1f4734be86ed3ae5afca0.tar.gz wordpress-mu-6ef7b48c2da1ad9731e1f4734be86ed3ae5afca0.tar.xz wordpress-mu-6ef7b48c2da1ad9731e1f4734be86ed3ae5afca0.zip | |
WP Merge to rev 4865
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@879 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/cache.php')
| -rw-r--r-- | wp-includes/cache.php | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/wp-includes/cache.php b/wp-includes/cache.php index 2232e15..b5a2b9d 100644 --- a/wp-includes/cache.php +++ b/wp-includes/cache.php @@ -217,22 +217,8 @@ class WP_Object_Cache { $this->cache[$this->key( $catt->cat_ID, 'category' )] = $catt;
}
}
- } else
- if ('options' == $group) {
- $wpdb->hide_errors();
- if (!$options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'")) {
- $options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
- }
- $wpdb->show_errors();
-
- if ( ! $options )
- return;
+ }
- foreach ($options as $option) {
- $this->cache['options'][$option->option_name] = $option->option_value;
- $this->cache[$this->key( $option->option_name, 'options' )] = $option->option_value;
- }
- }
}
function make_group_dir($group, $perms) {
|