<!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>[12371] trunk/wp-admin/press-this.php: Press This empty title fix,
props noel, see #11390, fixes #10715</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12371">12371</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-12-11 00:14:18 +0000 (Fri, 11 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Press This empty title fix, props noel, see <a href="http://trac.wordpress.org/ticket/11390">#11390</a>, fixes <a href="http://trac.wordpress.org/ticket/10715">#10715</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (12370 => 12371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2009-12-10 23:11:54 UTC (rev 12370)
+++ trunk/wp-admin/press-this.php 2009-12-11 00:14:18 UTC (rev 12371)
</span><span class="lines">@@ -43,37 +43,38 @@
</span><span class="cx"> // define some basic variables
</span><span class="cx"> $quick['post_status'] = 'draft'; // set as draft first
</span><span class="cx"> $quick['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : null;
</span><del>- $quick['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : '';
- $quick['post_title'] = isset($_POST['title']) ? $_POST['title'] : '';
- $quick['post_content'] = '';
</del><ins>+ $quick['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : null;
+ $quick['post_title'] = ( trim($_POST['title']) != '' ) ? $_POST['title'] : ' ';
+ $quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : '';
</ins><span class="cx">
</span><span class="cx"> // insert the post with nothing in it, to get an ID
</span><span class="cx"> $post_ID = wp_insert_post($quick, true);
</span><ins>+ if ( is_wp_error($post_ID) )
+ wp_die($post_ID);
+
</ins><span class="cx"> $content = isset($_POST['content']) ? $_POST['content'] : '';
</span><span class="cx">
</span><span class="cx"> $upload = false;
</span><del>- if( !empty($_POST['photo_src']) && current_user_can('upload_files') )
- foreach( (array) $_POST['photo_src'] as $key => $image)
</del><ins>+ if( !empty($_POST['photo_src']) && current_user_can('upload_files') ) {
+ foreach( (array) $_POST['photo_src'] as $key => $image) {
</ins><span class="cx"> // see if files exist in content - we don't want to upload non-used selected files.
</span><del>- if( strpos($_POST['content'], htmlspecialchars($image)) !== false ) {
</del><ins>+ if ( strpos($_POST['content'], htmlspecialchars($image)) !== false ) {
</ins><span class="cx"> $desc = isset($_POST['photo_description'][$key]) ? $_POST['photo_description'][$key] : '';
</span><span class="cx"> $upload = media_sideload_image($image, $post_ID, $desc);
</span><span class="cx">
</span><span class="cx"> // Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
</span><del>- if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote(htmlspecialchars($image), '/').'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
</del><ins>+ if( !is_wp_error($upload) )
+ $content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote(htmlspecialchars($image), '/').'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
</ins><span class="cx"> }
</span><del>-
</del><ins>+ }
+ }
</ins><span class="cx"> // set the post_content and status
</span><span class="cx"> $quick['post_status'] = isset($_POST['publish']) ? 'publish' : 'draft';
</span><span class="cx"> $quick['post_content'] = $content;
</span><del>- // error handling for $post
- if ( is_wp_error($post_ID)) {
- wp_die($id);
</del><ins>+ // error handling for media_sideload
+ if ( is_wp_error($upload) ) {
</ins><span class="cx"> wp_delete_post($post_ID);
</span><del>- // error handling for media_sideload
- } elseif ( is_wp_error($upload)) {
</del><span class="cx"> wp_die($upload);
</span><del>- wp_delete_post($post_ID);
</del><span class="cx"> } else {
</span><span class="cx"> $quick['ID'] = $post_ID;
</span><span class="cx"> wp_update_post($quick);
</span></span></pre>
</div>
</div>
</body>
</html>