<!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>[18823] trunk: Clean up remnants from having negative Post_IDs, props markjaquith, fixes #18235</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, #logmsg > ol { margin-left: 0; 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/18823">18823</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-09-29 21:47:52 +0000 (Thu, 29 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up remnants from having negative Post_IDs, props markjaquith, fixes <a href="http://core.trac.wordpress.org/ticket/18235">#18235</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (18822 => 18823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2011-09-29 21:47:04 UTC (rev 18822)
+++ trunk/wp-admin/edit-form-advanced.php 2011-09-29 21:47:52 UTC (rev 18823)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> * @var int
</span><span class="cx"> */
</span><span class="cx"> $post_ID = isset($post_ID) ? (int) $post_ID : 0;
</span><del>-$temp_ID = isset($temp_ID) ? (int) $temp_ID : 0;
</del><span class="cx"> $user_ID = isset($user_ID) ? (int) $user_ID : 0;
</span><span class="cx"> $action = isset($action) ? $action : '';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (18822 => 18823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2011-09-29 21:47:04 UTC (rev 18822)
+++ trunk/wp-admin/includes/media.php 2011-09-29 21:47:52 UTC (rev 18823)
</span><span class="lines">@@ -401,12 +401,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function get_upload_iframe_src($type) {
</span><del>- global $post_ID, $temp_ID;
- $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
</del><ins>+ global $post_ID;
+
+ $uploading_iframe_ID = (int) $post_ID;
</ins><span class="cx"> $upload_iframe_src = add_query_arg( 'post_id', $uploading_iframe_ID, admin_url('media-upload.php') );
</span><span class="cx">
</span><span class="cx"> if ( 'media' != $type )
</span><span class="cx"> $upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
</span><ins>+
</ins><span class="cx"> $upload_iframe_src = apply_filters($type . '_upload_iframe_src', $upload_iframe_src);
</span><span class="cx">
</span><span class="cx"> return add_query_arg('TB_iframe', true, $upload_iframe_src);
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (18822 => 18823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2011-09-29 21:47:04 UTC (rev 18822)
+++ trunk/wp-admin/includes/post.php 2011-09-29 21:47:52 UTC (rev 18823)
</span><span class="lines">@@ -229,12 +229,6 @@
</span><span class="cx">
</span><span class="cx"> wp_update_post( $post_data );
</span><span class="cx">
</span><del>- // Reunite any orphaned attachments with their parent
- if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
- $draft_ids = array();
- if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) )
- _relocate_children( $draft_temp_id, $post_ID );
-
</del><span class="cx"> // Now that we have an ID we can fix any attachment anchor hrefs
</span><span class="cx"> _fix_attachment_links( $post_ID );
</span><span class="cx">
</span><span class="lines">@@ -538,7 +532,6 @@
</span><span class="cx"> function wp_write_post() {
</span><span class="cx"> global $user_ID;
</span><span class="cx">
</span><del>-
</del><span class="cx"> if ( isset($_POST['post_type']) )
</span><span class="cx"> $ptype = get_post_type_object($_POST['post_type']);
</span><span class="cx"> else
</span><span class="lines">@@ -556,33 +549,9 @@
</span><span class="cx"> // Clear out any data in internal vars.
</span><span class="cx"> unset( $_POST['filter'] );
</span><span class="cx">
</span><del>- // Check for autosave collisions
- // Does this need to be updated? ~ Mark
- $temp_id = false;
- if ( isset($_POST['temp_ID']) ) {
- $temp_id = (int) $_POST['temp_ID'];
- if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
- $draft_ids = array();
- foreach ( $draft_ids as $temp => $real )
- if ( time() + $temp > 86400 ) // 1 day: $temp is equal to -1 * time( then )
- unset($draft_ids[$temp]);
-
- if ( isset($draft_ids[$temp_id]) ) { // Edit, don't write
- $_POST['post_ID'] = $draft_ids[$temp_id];
- unset($_POST['temp_ID']);
- update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
- return edit_post();
- }
- }
-
</del><span class="cx"> // Edit don't write if we have a post id.
</span><del>- if ( isset( $_POST['ID'] ) ) {
- $_POST['post_ID'] = $_POST['ID'];
- unset ( $_POST['ID'] );
- }
- if ( isset( $_POST['post_ID'] ) ) {
</del><ins>+ if ( isset( $_POST['post_ID'] ) )
</ins><span class="cx"> return edit_post();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> $translated = _wp_translate_postdata( false );
</span><span class="cx"> if ( is_wp_error($translated) )
</span><span class="lines">@@ -616,21 +585,6 @@
</span><span class="cx">
</span><span class="cx"> add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
</span><span class="cx">
</span><del>- // Reunite any orphaned attachments with their parent
- // Does this need to be updated? ~ Mark
- if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
- $draft_ids = array();
- if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) )
- _relocate_children( $draft_temp_id, $post_ID );
- if ( $temp_id && $temp_id != $draft_temp_id )
- _relocate_children( $temp_id, $post_ID );
-
- // Update autosave collision detection
- if ( $temp_id ) {
- $draft_ids[$temp_id] = $post_ID;
- update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
- }
-
</del><span class="cx"> // Now that we have an ID we can fix any attachment anchor hrefs
</span><span class="cx"> _fix_attachment_links( $post_ID );
</span><span class="cx">
</span><span class="lines">@@ -643,7 +597,10 @@
</span><span class="cx"> * Calls wp_write_post() and handles the errors.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><del>- *
</del><ins>+
+ * @uses wp_write_post()
+ * @uses is_wp_error()
+ * @uses wp_die()
</ins><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><span class="cx"> function write_post() {
</span><span class="lines">@@ -1322,11 +1279,14 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><del>- * @uses wp_write_post()
</del><ins>+ * @uses get_post_status()
</ins><span class="cx"> * @uses edit_post()
</span><span class="cx"> * @uses get_post()
</span><span class="cx"> * @uses current_user_can()
</span><ins>+ * @uses wp_die()
</ins><span class="cx"> * @uses wp_create_post_autosave()
</span><ins>+ * @uses add_query_arg()
+ * @uses wp_create_nonce()
</ins><span class="cx"> *
</span><span class="cx"> * @return str URL to redirect to show the preview
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (18822 => 18823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2011-09-29 21:47:04 UTC (rev 18822)
+++ trunk/wp-includes/post.php 2011-09-29 21:47:52 UTC (rev 18823)
</span><span class="lines">@@ -3728,9 +3728,6 @@
</span><span class="cx">
</span><span class="cx"> clean_post_cache($post_ID);
</span><span class="cx">
</span><del>- if ( isset($post_parent) && $post_parent < 0 )
- add_post_meta($post_ID, '_wp_attachment_temp_parent', $post_parent, true);
-
</del><span class="cx"> if ( ! empty( $context ) )
</span><span class="cx"> add_post_meta( $post_ID, '_wp_attachment_context', $context, true );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>