Index: wp-includes/cache.php =================================================================== --- wp-includes/cache.php (revision 21358) +++ wp-includes/cache.php (working copy) @@ -21,10 +21,10 @@ * @param int $expire When the cache data should be expired * @return unknown */ -function wp_cache_add($key, $data, $group = '', $expire = 0) { +function wp_cache_add( $key, $data, $group = '', $expire = 0 ) { global $wp_object_cache; - return $wp_object_cache->add($key, $data, $group, $expire); + return $wp_object_cache->add( $key, $data, $group, $expire ); } /** @@ -72,10 +72,10 @@ * @param string $group Where the cache contents are grouped * @return bool True on successful removal, false on failure */ -function wp_cache_delete($key, $group = '') { +function wp_cache_delete( $key, $group = '' ) { global $wp_object_cache; - return $wp_object_cache->delete($key, $group); + return $wp_object_cache->delete( $key, $group ); } /** @@ -154,10 +154,10 @@ * @param int $expire When to expire the cache contents * @return bool False if cache key and group already exist, true on success */ -function wp_cache_replace($key, $data, $group = '', $expire = 0) { +function wp_cache_replace( $key, $data, $group = '', $expire = 0 ) { global $wp_object_cache; - return $wp_object_cache->replace($key, $data, $group, $expire); + return $wp_object_cache->replace( $key, $data, $group, $expire ); } /** @@ -173,10 +173,10 @@ * @param int $expire When to expire the cache contents * @return bool False if cache key and group already exist, true on success */ -function wp_cache_set($key, $data, $group = '', $expire = 0) { +function wp_cache_set( $key, $data, $group = '', $expire = 0 ) { global $wp_object_cache; - return $wp_object_cache->set($key, $data, $group, $expire); + return $wp_object_cache->set( $key, $data, $group, $expire ); } /** @@ -189,7 +189,7 @@ function wp_cache_add_global_groups( $groups ) { global $wp_object_cache; - return $wp_object_cache->add_global_groups($groups); + return $wp_object_cache->add_global_groups( $groups ); } /** @@ -241,7 +241,7 @@ * @access private * @since 2.0.0 */ - var $cache = array (); + var $cache = array(); /** * The amount of times the cache data was already stored in the cache. @@ -292,10 +292,10 @@ if ( empty( $group ) ) $group = 'default'; - if ( $this->_exists($key, $group) ) + if ( $this->_exists( $key, $group ) ) return false; - return $this->set($key, $data, $group, $expire); + return $this->set( $key, $data, $group, $expire ); } /** @@ -308,8 +308,8 @@ function add_global_groups( $groups ) { $groups = (array) $groups; - $this->global_groups = array_merge($this->global_groups, $groups); - $this->global_groups = array_unique($this->global_groups); + $this->global_groups = array_merge( $this->global_groups, $groups ); + $this->global_groups = array_unique( $this->global_groups ); } /** @@ -357,14 +357,14 @@ * key in the group * @return bool False if the contents weren't deleted and true on success */ - function delete($key, $group = 'default', $force = false) { + function delete( $key, $group = 'default', $force = false ) { if ( empty( $group ) ) $group = 'default'; if ( ! $force && ! $this->_exists( $key, $group ) ) return false; - unset( $this->cache[$group][$key] ); + unset( $this->cache[ $group ][ $key ] ); return true; } @@ -376,7 +376,7 @@ * @return bool Always returns true */ function flush() { - $this->cache = array (); + $this->cache = array(); return true; } @@ -405,10 +405,10 @@ if ( $this->_exists( $key, $group ) ) { $found = true; $this->cache_hits += 1; - if ( is_object($this->cache[$group][$key]) ) - return clone $this->cache[$group][$key]; + if ( is_object( $this->cache[ $group ][ $key ] ) ) + return clone $this->cache[ $group ][ $key ]; else - return $this->cache[$group][$key]; + return $this->cache[ $group ][ $key ]; } $found = false; @@ -458,14 +458,14 @@ * @param int $expire When to expire the cache contents * @return bool False if not exists, true if contents were replaced */ - function replace($key, $data, $group = 'default', $expire = '') { + function replace( $key, $data, $group = 'default', $expire = '' ) { if ( empty( $group ) ) $group = 'default'; if ( ! $this->_exists( $key, $group ) ) return false; - return $this->set($key, $data, $group, $expire); + return $this->set( $key, $data, $group, $expire ); } /** @@ -475,9 +475,9 @@ */ function reset() { // Clear out non-global caches since the blog ID has changed. - foreach ( array_keys($this->cache) as $group ) { - if ( !in_array($group, $this->global_groups) ) - unset($this->cache[$group]); + foreach ( array_keys( $this->cache ) as $group ) { + if ( !in_array( $group, $this->global_groups ) ) + unset( $this->cache[ $group ] ); } } @@ -501,14 +501,14 @@ * @param int $expire Not Used * @return bool Always returns true */ - function set($key, $data, $group = 'default', $expire = '') { + function set( $key, $data, $group = 'default', $expire = '' ) { if ( empty( $group ) ) $group = 'default'; - if ( is_object($data) ) + if ( is_object( $data ) ) $data = clone $data; - $this->cache[$group][$key] = $data; + $this->cache[ $group ][ $key ] = $data; return true; } @@ -526,7 +526,7 @@ echo "Cache Misses: {$this->cache_misses}
"; echo "

"; echo ''; @@ -542,31 +542,4 @@ protected function _exists( $key, $group ) { return isset( $this->cache[ $group ] ) && ( isset( $this->cache[ $group ][ $key ] ) || array_key_exists( $key, $this->cache[ $group ] ) ); } - - /** - * Sets up object properties; PHP 5 style constructor - * - * @since 2.0.8 - * @return null|WP_Object_Cache If cache is disabled, returns null. - */ - function __construct() { - /** - * @todo This should be moved to the PHP4 style constructor, PHP5 - * already calls __destruct() - */ - register_shutdown_function(array(&$this, "__destruct")); - } - - /** - * Will save the object cache before object is completely destroyed. - * - * Called upon object destruction, which should be when PHP ends. - * - * @since 2.0.8 - * - * @return bool True value. Won't be used by PHP - */ - function __destruct() { - return true; - } }