<!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>[12469] trunk/wp-admin/import/wordpress.php:
Fix some notices in the importer when importing files from old WordPress versions or not fetching attachments
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12469">12469</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-12-21 15:26:57 +0000 (Mon, 21 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some notices in the importer when importing files from old WordPress versions or not fetching attachments. See <a href="http://trac.wordpress.org/ticket/11484">#11484</a>.
Ensure that we check that a user is created for the username we specify and otherwise fallback to the current user
See <a href="http://trac.wordpress.org/ticket/10319">#10319</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 (12468 => 12469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/wordpress.php 2009-12-21 15:25:00 UTC (rev 12468)
+++ trunk/wp-admin/import/wordpress.php 2009-12-21 15:26:57 UTC (rev 12469)
</span><span class="lines">@@ -60,8 +60,12 @@
</span><span class="cx"> function get_tag( $string, $tag ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return);
</span><del>- $return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
- $return = $wpdb->escape( trim( $return ) );
</del><ins>+ if ( isset($return[1]) ) {
+ $return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
+ $return = $wpdb->escape( trim( $return ) );
+ } else {
+ $return = '';
+ }
</ins><span class="cx"> return $return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -190,8 +194,10 @@
</span><span class="cx"> if ( !$user_id ) {
</span><span class="cx"> $user_id = wp_create_user($new_author_name, wp_generate_password());
</span><span class="cx"> }
</span><del>-
- $this->author_ids[$in_author_name] = $user_id;
</del><ins>+
+ if ( !is_wp_error( $user_id ) ) {
+ $this->author_ids[$in_author_name] = $user_id;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // failsafe: if the user_id was invalid, default to the current user
</span><span class="lines">@@ -842,7 +848,8 @@
</span><span class="cx"> break;
</span><span class="cx"> case 2:
</span><span class="cx"> check_admin_referer('import-wordpress');
</span><del>- $result = $this->import( $_GET['id'], $_POST['attachments'] );
</del><ins>+ $fetch_attachments = (!empty($_POST['attachments'])) ? true : false;
+ $result = $this->import( $_GET['id'], $fetch_attachments);
</ins><span class="cx"> if ( is_wp_error( $result ) )
</span><span class="cx"> echo $result->get_error_message();
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>