<!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>[14497] trunk/wp-admin/import/wordpress.php:
Fix warnings in WordPress importer.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14497">14497</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-07 04:35:10 +0000 (Fri, 07 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix warnings in WordPress importer. props briancolinger, fixes <a href="http://trac.wordpress.org/ticket/13263">#13263</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 (14496 => 14497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/wordpress.php 2010-05-07 04:30:53 UTC (rev 14496)
+++ trunk/wp-admin/import/wordpress.php 2010-05-07 04:35:10 UTC (rev 14497)
</span><span class="lines">@@ -472,8 +472,8 @@
</span><span class="cx"> $post_parent = (int) $post_parent;
</span><span class="cx"> if ($post_parent) {
</span><span class="cx"> // if we already know the parent, map it to the local ID
</span><del>- if ( $parent = $this->post_ids_processed[$post_parent] ) {
- $post_parent = $parent; // new ID of the parent
</del><ins>+ if ( isset( $this->post_ids_processed[$post_parent] ) ) {
+ $post_parent = $this->post_ids_processed[$post_parent]; // new ID of the parent
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> // record the parent for later
</span><span class="lines">@@ -760,8 +760,12 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> foreach ($this->orphans as $child_id => $parent_id) {
</span><del>- $local_child_id = $this->post_ids_processed[$child_id];
- $local_parent_id = $this->post_ids_processed[$parent_id];
</del><ins>+ $local_child_id = $local_parent_id = false;
+ if ( isset( $this->post_ids_processed[$child_id] ) )
+ $local_child_id = $this->post_ids_processed[$child_id];
+ if ( isset( $this->post_ids_processed[$parent_id] ) )
+ $local_parent_id = $this->post_ids_processed[$parent_id];
+
</ins><span class="cx"> if ($local_child_id and $local_parent_id) {
</span><span class="cx"> $wpdb->update($wpdb->posts, array('post_parent' => $local_parent_id), array('ID' => $local_child_id) );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>