<!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>[2170] 2013/frederickding/importer/trunk/class-wordpress-importer.php: Fix missing `sprintf()` in WP_Error warnings; see #331.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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://gsoc.trac.wordpress.org/changeset/2170">2170</a></dd>
<dt>Author</dt> <dd>frederick.ding</dd>
<dt>Date</dt> <dd>2013-07-29 06:01:55 +0000 (Mon, 29 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix missing `sprintf()` in WP_Error warnings; see <a href="http://gsoc.trac.wordpress.org/ticket/331">#331</a>.
- Previously introduced by <a href="http://gsoc.trac.wordpress.org/changeset/2157">[2157]</a>, <a href="http://gsoc.trac.wordpress.org/changeset/2158">[2158]</a>, <a href="http://gsoc.trac.wordpress.org/changeset/2159">[2159]</a>, and <a href="http://gsoc.trac.wordpress.org/changeset/2164">[2164]</a>; original
non-cron code used `printf()`</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013frederickdingimportertrunkclasswordpressimporterphp">2013/frederickding/importer/trunk/class-wordpress-importer.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013frederickdingimportertrunkclasswordpressimporterphp"></a>
<div class="modfile"><h4>Modified: 2013/frederickding/importer/trunk/class-wordpress-importer.php (2169 => 2170)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/frederickding/importer/trunk/class-wordpress-importer.php 2013-07-29 05:24:08 UTC (rev 2169)
+++ 2013/frederickding/importer/trunk/class-wordpress-importer.php 2013-07-29 06:01:55 UTC (rev 2170)
</span><span class="lines">@@ -370,10 +370,11 @@
</span><span class="cx"> if ( empty( $login ) ) {
</span><span class="cx"> $this->warnings[] = new WP_Error(
</span><span class="cx"> 'import_process_authors_warning',
</span><del>- __(
- 'Failed to import author %s. Their posts will be attributed to the current user.',
- 'wordpress-importer' ),
- esc_html( $post['post_author'] ) );
</del><ins>+ sprintf(
+ __(
+ 'Failed to import author %s. Their posts will be attributed to the current user.',
+ 'wordpress-importer' ),
+ esc_html( $post['post_author'] ) ) );
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -457,14 +458,16 @@
</span><span class="cx"> $this->processed_authors[$old_id] = $user_id;
</span><span class="cx"> $this->processed_author_mappings[$sanitized_old_login] = $user_id;
</span><span class="cx"> } else {
</span><del>- // set a warning in the importer class, and include the
- // WP_Error object emitted by wp_insert_user() as data.
- $this->warnings[] = new WP_Error(
- 'import_process_author_mappings_warning',
- __(
- 'Failed to create new user for %s. Their posts will be attributed to the current user.',
- 'wordpress-importer' ),
- esc_html( $this->authors[$old_login]['author_display_name'] ),
</del><ins>+ // set a warning in the importer class, and include the
+ // WP_Error object emitted by wp_insert_user() as data.
+ $this->warnings[] = new WP_Error(
+ 'import_process_author_mappings_warning',
+ sprintf(
+ __(
+ 'Failed to create new user for %s. Their posts will be attributed to the current user.',
+ 'wordpress-importer' ),
+ esc_html(
+ $this->authors[$old_login]['author_display_name'] ) ),
</ins><span class="cx"> $user_id );
</span><span class="cx"> // really wish WP_Error were like an exception and that we
</span><span class="cx"> // could use try...catch...finally.
</span><span class="lines">@@ -547,13 +550,14 @@
</span><span class="cx"> if ( isset( $cat['term_id'] ) )
</span><span class="cx"> $this->processed_terms[intval( $cat['term_id'] )] = $id;
</span><span class="cx"> } else {
</span><del>- // set a warning in the importer class, and include the
- // WP_Error object emitted by wp_insert_category() as data.
</del><ins>+ // set a warning in the importer class, and include the
+ // WP_Error object emitted by wp_insert_category() as data.
</ins><span class="cx"> $this->warnings[] = new WP_Error(
</span><span class="cx"> 'import_process_categories_warning',
</span><del>- __( 'Failed to import category %s',
- 'wordpress-importer' ),
- esc_html( $cat['category_nicename'] ), $id );
</del><ins>+ sprintf(
+ __( 'Failed to import category %s',
+ 'wordpress-importer' ),
+ esc_html( $cat['category_nicename'] ) ), $id );
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -601,13 +605,14 @@
</span><span class="cx"> if ( isset( $tag['term_id'] ) )
</span><span class="cx"> $this->processed_terms[intval( $tag['term_id'] )] = $id['term_id'];
</span><span class="cx"> } else {
</span><del>- // set a warning in the importer class, and include the
- // WP_Error object emitted by wp_insert_category() as data.
</del><ins>+ // set a warning in the importer class, and include the
+ // WP_Error object emitted by wp_insert_category() as data.
</ins><span class="cx"> $this->warnings[] = new WP_Error(
</span><span class="cx"> 'import_process_tags_warning',
</span><del>- __( 'Failed to import post tag %s',
- 'wordpress-importer' ),
- esc_html( $tag['tag_name'] ), $id );
</del><ins>+ sprintf(
+ __( 'Failed to import post tag %s',
+ 'wordpress-importer' ),
+ esc_html( $tag['tag_name'] ) ), $id );
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -665,13 +670,14 @@
</span><span class="cx"> $this->processed_terms[intval( $term['term_id'] )] = $id['term_id'];
</span><span class="cx"> } else {
</span><span class="cx"> // set a warning in the importer class, and include the
</span><del>- // WP_Error object emitted by wp_insert_category() as data.
</del><ins>+ // WP_Error object emitted by wp_insert_term() as data.
</ins><span class="cx"> $this->warnings[] = new WP_Error(
</span><span class="cx"> 'import_process_term_warning',
</span><del>- __( 'Failed to import %s %s',
- 'wordpress-importer' ),
- esc_html( $term['term_taxonomy'] ),
- esc_html( $term['term_name'] ), $id );
</del><ins>+ sprintf(
+ __( 'Failed to import %s %s',
+ 'wordpress-importer' ),
+ esc_html( $term['term_taxonomy'] ),
+ esc_html( $term['term_name'] ) ), $id );
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> } // foreach
</span><span class="lines">@@ -753,15 +759,18 @@
</span><span class="cx"> foreach ( $iterator as $post ) {
</span><span class="cx"> $post = apply_filters( 'wp_import_post_data_raw', $post );
</span><span class="cx"> if ( ! post_type_exists( $post['post_type'] ) ) {
</span><ins>+ $error_data = array(
+ 'title' => esc_html( $post['post_title'] ),
+ 'post_type' => esc_html( $post['post_type'] )
+ );
</ins><span class="cx"> $this->warnings[] = new WP_Error(
</span><span class="cx"> 'import_process_posts_post_type_warning',
</span><del>- __(
- 'Failed to import “%s”: Invalid post type %s',
- 'wordpress-importer' ),
- array(
- 'title' => esc_html( $post['post_title'] ),
- 'post_type' => esc_html( $post['post_type'] )
- ) );
</del><ins>+ sprintf(
+ __(
+ 'Failed to import “%s”: Invalid post type %s',
+ 'wordpress-importer' ),
+ $error_data['title'], $error_data['post_type'] ),
+ $error_data );
</ins><span class="cx"> do_action( 'wp_import_post_exists', $post );
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -786,8 +795,11 @@
</span><span class="cx"> get_post_type( $post_exists ) == $post['post_type'] ) {
</span><span class="cx"> $this->warnings[] = new WP_Error(
</span><span class="cx"> 'import_process_posts_post_exists_warning',
</span><del>- __( '%s “%s” already exists.',
- 'wordpress-importer' ),
</del><ins>+ sprintf(
+ __( '%s “%s” already exists.',
+ 'wordpress-importer' ),
+ $post_type_object->labels->singular_name,
+ esc_html( $post['post_title'] ) ),
</ins><span class="cx"> array(
</span><span class="cx"> 'post_type' => $post_type_object->labels->singular_name,
</span><span class="cx"> 'title' => esc_html( $post['post_title'] )
</span><span class="lines">@@ -871,14 +883,12 @@
</span><span class="cx"> if ( is_wp_error( $post_id ) ) {
</span><span class="cx"> $this->warnings[] = new WP_Error(
</span><span class="cx"> 'import_process_posts_failure_warning',
</span><del>- __( 'Failed to import %s “%s”',
- 'wordpress-importer' ),
- array(
- 'post_type' => $post_type_object->labels->singular_name,
- 'post_title' => esc_html(
- $post['post_title'] ),
- 'previous_error' => $post_id
- ) );
</del><ins>+ sprintf(
+ __(
+ 'Failed to import %s “%s”',
+ 'wordpress-importer' ),
+ $post_type_object->labels->singular_name,
+ esc_html( $post['post_title'] ) ), $post_id );
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -915,10 +925,11 @@
</span><span class="cx"> } else {
</span><span class="cx"> $this->warnings[] = new WP_Error(
</span><span class="cx"> 'import_process_term_warning',
</span><del>- __( 'Failed to import %s %s',
- 'wordpress-importer' ),
- esc_html( $taxonomy ),
- esc_html( $term['name'] ), $t );
</del><ins>+ sprintf(
+ __( 'Failed to import %s %s',
+ 'wordpress-importer' ),
+ esc_html( $taxonomy ),
+ esc_html( $term['name'] ) ), $t );
</ins><span class="cx"> do_action( 'wp_import_insert_term_failed', $t,
</span><span class="cx"> $term, $post_id, $post );
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
</body>
</html>