<!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>[13735] trunk/wp-admin/import/wordpress.php: WP importer fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13735">13735</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-03-17 16:56:10 +0000 (Wed, 17 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>WP importer fixes. Props briancolinger. fixes <a href="http://trac.wordpress.org/ticket/12619">#12619</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminimportwordpressphp">trunk/wp-admin/import/wordpress.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminimportwordpressphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/wordpress.php (13734 => 13735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/wordpress.php 2010-03-17 16:52:44 UTC (rev 13734)
+++ trunk/wp-admin/import/wordpress.php 2010-03-17 16:56:10 UTC (rev 13735)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">
</span><span class="cx"> // this will populate $this->author_ids with a list of author_names => user_ids
</span><span class="cx">
</span><del>- foreach ( $_POST['author_in'] as $i => $in_author_name ) {
</del><ins>+ foreach ( (array) $_POST['author_in'] as $i => $in_author_name ) {
</ins><span class="cx">
</span><span class="cx"> if ( !empty($_POST['user_select'][$i]) ) {
</span><span class="cx"> // an existing user was selected in the dropdown list
</span><span class="lines">@@ -319,6 +319,7 @@
</span><span class="cx">
</span><span class="cx"> $catarr = compact('category_nicename', 'category_parent', 'posts_private', 'links_private', 'posts_private', 'cat_name', 'category_description');
</span><span class="cx">
</span><ins>+ print "<em>" . __( "Importing category $cat_name" ) . "</em><br />\n";
</ins><span class="cx"> $cat_ID = wp_insert_category($catarr);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -340,6 +341,7 @@
</span><span class="cx">
</span><span class="cx"> $tagarr = compact('slug', 'description');
</span><span class="cx">
</span><ins>+ print "<em>" . __( "Importing tag $tag_name" ) . "</em><br />\n";
</ins><span class="cx"> $tag_ID = wp_insert_term($tag_name, 'post_tag', $tagarr);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -377,6 +379,7 @@
</span><span class="cx">
</span><span class="cx"> $termarr = compact('slug', 'description');
</span><span class="cx">
</span><ins>+ print "<em>" . __( "Importing $term_name" ) . "</em><br />\n";
</ins><span class="cx"> $term_ID = wp_insert_term($term_name, $this->get_tag( $c, 'wp:term_taxonomy' ), $termarr);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -494,7 +497,7 @@
</span><span class="cx"> return $post_id;
</span><span class="cx"> }
</span><span class="cx"> else {
</span><del>- printf(__('Importing post <em>%s</em>...'), stripslashes($post_title));
</del><ins>+ printf(__('Importing post <em>%s</em>...') . "\n", stripslashes($post_title));
</ins><span class="cx"> $comment_post_ID = $post_id = wp_insert_post($postdata);
</span><span class="cx"> if ( $post_id && $is_sticky == 1 )
</span><span class="cx"> stick_post( $post_id );
</span><span class="lines">@@ -636,6 +639,12 @@
</span><span class="cx"> print '('.size_format(filesize($upload['file'])).')';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( 0 == filesize( $upload['file'] ) ) {
+ print __( "Zero length file, deleting" ) . "\n";
+ unlink( $upload['file'] );
+ return;
+ }
+
</ins><span class="cx"> if ( $info = wp_check_filetype($upload['file']) ) {
</span><span class="cx"> $postdata['post_mime_type'] = $info['type'];
</span><span class="cx"> }
</span><span class="lines">@@ -665,7 +674,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function fetch_remote_file($post, $url) {
</del><ins>+ function fetch_remote_file( $post, $url ) {
+ add_filter( 'http_request_timeout', array( &$this, 'bump_request_timeout' ) );
+
</ins><span class="cx"> $upload = wp_upload_dir($post['post_date']);
</span><span class="cx">
</span><span class="cx"> // extract the file name and extension from the url
</span><span class="lines">@@ -705,6 +716,7 @@
</span><span class="cx">
</span><span class="cx"> // keep track of the old and new urls so we can substitute them later
</span><span class="cx"> $this->url_remap[$url] = $upload['url'];
</span><ins>+ $this->url_remap[$post['guid']] = $upload['url'];
</ins><span class="cx"> // if the remote url is redirected somewhere else, keep track of the destination too
</span><span class="cx"> if ( $headers['x-final-location'] != $url )
</span><span class="cx"> $this->url_remap[$headers['x-final-location']] = $upload['url'];
</span><span class="lines">@@ -713,6 +725,16 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Bump up the request timeout for http requests
+ *
+ * @param int $val
+ * @return int
+ */
+ public function bump_request_timeout( $val ) {
+ return 60;
+ }
+
</ins><span class="cx"> // sort by strlen, longest string first
</span><span class="cx"> function cmpr_strlen($a, $b) {
</span><span class="cx"> return strlen($b) - strlen($a);
</span></span></pre>
</div>
</div>
</body>
</html>