Changeset 17613

Timestamp:

04/06/2011 05:44:29 PM (14 years ago)

Author:

ryan

Message:

Deprecate wp_clone(). Call clone directly. Props hakre. fixes #16813

Location:

trunk/wp-includes

Files:

• cache.php (modified) (2 diffs)
• comment.php (modified) (1 diff)
• deprecated.php (modified) (1 diff)
• functions.php (modified) (2 diffs)
• load.php (modified) (1 diff)

trunk/wp-includes/cache.php

@@ -351 +351 @@
             $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];
@@ -427 +427 @@
 
         if ( is_object($data) )
-            $data = wp_clone($data);
+            $data = clone $data;
 
         $this->cache[$group][$id] = $data;

trunk/wp-includes/comment.php

@@ -1395 +1395 @@
     }
 
-    $comment_old = wp_clone(get_comment($comment_id));
+    $comment_old = clone get_comment($comment_id);
 
     if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_id) ) ) {

trunk/wp-includes/deprecated.php

@@ -2603 +2603 @@
 }
 
+
+/**
+ * Copy an object.
+ *
+ * Returns a cloned copy of an object.
+ *
+ * @since 2.7.0
+ * @deprecated 3.2
+ *
+ * @param object $object The object to clone
+ * @return object The cloned object
+ */
+function wp_clone( $object ) {
+    _deprecated_function( __FUNCTION__, '3.2' );
+
+    return clone $object;
+}

trunk/wp-includes/functions.php

@@ -510 +510 @@
 
     if ( is_object($newvalue) )
-        $newvalue = wp_clone($newvalue);
+        $newvalue = clone $newvalue;
 
     $newvalue = sanitize_option( $option, $newvalue );
@@ -591 +591 @@
     wp_protect_special_option( $option );
 
+    /* 
+     * FIXME the next two lines of code are not necessary and should be removed.
+     * @see http://core.trac.wordpress.org/ticket/13480
+     */
     if ( is_object($value) )
-        $value = wp_clone($value);
+        $value = clone $value;
 
     $value = sanitize_option( $option, $value );

trunk/wp-includes/load.php

@@ -555 +555 @@
 
 /**
- * Copy an object.
- *
- * Returns a cloned copy of an object.
- *
- * @since 2.7.0
- *
- * @param object $object The object to clone
- * @return object The cloned object
- */
-function wp_clone( $object ) {
-    static $can_clone;
-    if ( !isset( $can_clone ) )
-        $can_clone = version_compare( phpversion(), '5.0', '>=' );
-
-    return $can_clone ? clone( $object ) : $object;
-}
-
-/**
  * Whether the current request is for a network or blog admin page
  *