Wordpress 3.2

[autoinstalls/wordpress.git] / wp-includes / cache.php

diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index 895c43161a0b607bacbe7c15991fb38a29aa7053..f73f02bf65abdca641675020e22302b6c9bd26d8 100644 (file)
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -350,7 +350,7 @@ class WP_Object_Cache {
                if ( isset ($this->cache[$group][$id]) ) {
                        $this->cache_hits += 1;
                        if ( is_object($this->cache[$group][$id]) )
-                               return wp_clone($this->cache[$group][$id]);
+                               return clone $this->cache[$group][$id];
                        else
                                return $this->cache[$group][$id];
                }
@@ -426,7 +426,7 @@ class WP_Object_Cache {
                        $data = '';
 
                if ( is_object($data) )
-                       $data = wp_clone($data);
+                       $data = clone $data;
 
                $this->cache[$group][$id] = $data;
 
@@ -456,17 +456,6 @@ class WP_Object_Cache {
                echo '</ul>';
        }
 
-       /**
-        * PHP4 constructor; Calls PHP 5 style constructor
-        *
-        * @since 2.0.0
-        *
-        * @return WP_Object_Cache
-        */
-       function WP_Object_Cache() {
-               return $this->__construct();
-       }
-
        /**
         * Sets up object properties; PHP 5 style constructor
         *