<!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" />
<title>[29745] trunk: Make sure the $parent argument of wp_insert_attachment() still works as expected after [28579].</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29745">29745</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2014-09-15 14:23:31 +0000 (Mon, 15 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure the $parent argument of wp_insert_attachment() still works as expected after <a href="http://core.trac.wordpress.org/changeset/28579">[28579]</a>.
prop jesin, dikiy_forester.
fixes <a href="http://core.trac.wordpress.org/ticket/29646">#29646</a> for trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunittestspostattachmentsphp">trunk/tests/phpunit/tests/post/attachments.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/post.php (29744 => 29745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/post.php 2014-09-13 22:23:12 UTC (rev 29744)
+++ trunk/src/wp-includes/post.php 2014-09-15 14:23:31 UTC (rev 29745)
</span><span class="lines">@@ -4719,10 +4719,15 @@
</span><span class="cx"> function wp_insert_attachment( $args, $file = false, $parent = 0 ) {
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'file' => $file,
</span><del>- 'post_parent' => $parent
</del><ins>+ 'post_parent' => 0
</ins><span class="cx"> );
</span><ins>+
</ins><span class="cx"> $data = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><ins>+ if ( ! empty( $parent ) ) {
+ $data['post_parent'] = $parent;
+ }
+
</ins><span class="cx"> $data['post_type'] = 'attachment';
</span><span class="cx">
</span><span class="cx"> return wp_insert_post( $data );
</span></span></pre></div>
<a id="trunktestsphpunittestspostattachmentsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/post/attachments.php (29744 => 29745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/post/attachments.php 2014-09-13 22:23:12 UTC (rev 29744)
+++ trunk/tests/phpunit/tests/post/attachments.php 2014-09-15 14:23:31 UTC (rev 29745)
</span><span class="lines">@@ -254,4 +254,28 @@
</span><span class="cx"> $this->assertEquals( $attached_file, get_post_meta( $id, '_wp_attached_file', true ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * @ticket 29646
+ */
+ function test_update_orphan_attachment_parent() {
+ $filename = ( DIR_TESTDATA . '/images/test-image.jpg' );
+ $contents = file_get_contents( $filename );
+
+ $upload = wp_upload_bits( basename( $filename ), null, $contents );
+ $this->assertTrue( empty( $upload['error'] ) );
+
+ $attachment_id = $this->_make_attachment( $upload );
+
+ // Assert that the attachment is an orphan
+ $attachment = get_post( $attachment_id );
+ $this->assertEquals( $attachment->post_parent, 0 );
+
+ $post_id = wp_insert_post( array( 'post_content' => rand_str(), 'post_title' => rand_str() ) );
+
+ // Assert that the attachment has a parent
+ wp_insert_attachment( $attachment, '', $post_id );
+ $attachment = get_post( $attachment_id );
+ $this->assertEquals( $attachment->post_parent, $post_id );
+ }
+
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>