<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17613] trunk/wp-includes: Deprecate wp_clone().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17613">17613</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-06 17:44:29 +0000 (Wed, 06 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate wp_clone(). Call clone directly. Props hakre. fixes <a href="http://trac.wordpress.org/ticket/16813">#16813</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescachephp">trunk/wp-includes/cache.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescachephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cache.php (17612 => 17613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cache.php 2011-04-06 17:07:59 UTC (rev 17612)
+++ trunk/wp-includes/cache.php 2011-04-06 17:44:29 UTC (rev 17613)
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> if ( isset ($this->cache[$group][$id]) ) {
</span><span class="cx"> $this->cache_hits += 1;
</span><span class="cx"> if ( is_object($this->cache[$group][$id]) )
</span><del>- return wp_clone($this->cache[$group][$id]);
</del><ins>+ return clone $this->cache[$group][$id];
</ins><span class="cx"> else
</span><span class="cx"> return $this->cache[$group][$id];
</span><span class="cx"> }
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> $data = '';
</span><span class="cx">
</span><span class="cx"> if ( is_object($data) )
</span><del>- $data = wp_clone($data);
</del><ins>+ $data = clone $data;
</ins><span class="cx">
</span><span class="cx"> $this->cache[$group][$id] = $data;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (17612 => 17613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2011-04-06 17:07:59 UTC (rev 17612)
+++ trunk/wp-includes/comment.php 2011-04-06 17:44:29 UTC (rev 17613)
</span><span class="lines">@@ -1394,7 +1394,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $comment_old = wp_clone(get_comment($comment_id));
</del><ins>+ $comment_old = clone get_comment($comment_id);
</ins><span class="cx">
</span><span class="cx"> if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_id) ) ) {
</span><span class="cx"> if ( $wp_error )
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (17612 => 17613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2011-04-06 17:07:59 UTC (rev 17612)
+++ trunk/wp-includes/deprecated.php 2011-04-06 17:44:29 UTC (rev 17613)
</span><span class="lines">@@ -2602,3 +2602,20 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+/**
+ * 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;
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (17612 => 17613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2011-04-06 17:07:59 UTC (rev 17612)
+++ trunk/wp-includes/functions.php 2011-04-06 17:44:29 UTC (rev 17613)
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx"> wp_protect_special_option( $option );
</span><span class="cx">
</span><span class="cx"> if ( is_object($newvalue) )
</span><del>- $newvalue = wp_clone($newvalue);
</del><ins>+ $newvalue = clone $newvalue;
</ins><span class="cx">
</span><span class="cx"> $newvalue = sanitize_option( $option, $newvalue );
</span><span class="cx"> $oldvalue = get_option( $option );
</span><span class="lines">@@ -590,8 +590,12 @@
</span><span class="cx">
</span><span class="cx"> wp_protect_special_option( $option );
</span><span class="cx">
</span><ins>+ /*
+ * FIXME the next two lines of code are not necessary and should be removed.
+ * @see http://core.trac.wordpress.org/ticket/13480
+ */
</ins><span class="cx"> if ( is_object($value) )
</span><del>- $value = wp_clone($value);
</del><ins>+ $value = clone $value;
</ins><span class="cx">
</span><span class="cx"> $value = sanitize_option( $option, $value );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (17612 => 17613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2011-04-06 17:07:59 UTC (rev 17612)
+++ trunk/wp-includes/load.php 2011-04-06 17:44:29 UTC (rev 17613)
</span><span class="lines">@@ -554,24 +554,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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;
-}
-
-/**
</del><span class="cx"> * Whether the current request is for a network or blog admin page
</span><span class="cx"> *
</span><span class="cx"> * Does not inform on whether the user is an admin! Use capability checks to
</span></span></pre>
</div>
</div>
</body>
</html>