<!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>[20856] trunk/wp-includes/class-wp-xmlrpc-server.php: Introduce _prepare_comment().</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, #logmsg > ol { margin-left: 0; 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://core.trac.wordpress.org/changeset/20856">20856</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-05-23 20:40:40 +0000 (Wed, 23 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce _prepare_comment(). Avoid repeated auth attempts. Props maxcutler. fixes <a href="http://core.trac.wordpress.org/ticket/20703">#20703</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (20855 => 20856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2012-05-23 20:36:46 UTC (rev 20855)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2012-05-23 20:40:40 UTC (rev 20856)
</span><span class="lines">@@ -825,6 +825,48 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Prepares comment data for return in an XML-RPC object.
+ *
+ * @access protected
+ *
+ * @param object $comment The unprepared comment data
+ * @return array The prepared comment data
+ */
+ protected function _prepare_comment( $comment ) {
+ // Format page date.
+ $comment_date = $this->_convert_date( $comment->comment_date );
+ $comment_date_gmt = $this->_convert_date_gmt( $comment->comment_date_gmt, $comment->comment_date );
+
+ if ( '0' == $comment->comment_approved )
+ $comment_status = 'hold';
+ else if ( 'spam' == $comment->comment_approved )
+ $comment_status = 'spam';
+ else if ( '1' == $comment->comment_approved )
+ $comment_status = 'approve';
+ else
+ $comment_status = $comment->comment_approved;
+
+ $_comment = array(
+ 'date_created_gmt' => $comment_date_gmt,
+ 'user_id' => $comment->user_id,
+ 'comment_id' => $comment->comment_ID,
+ 'parent' => $comment->comment_parent,
+ 'status' => $comment_status,
+ 'content' => $comment->comment_content,
+ 'link' => get_comment_link($comment),
+ 'post_id' => $comment->comment_post_ID,
+ 'post_title' => get_the_title($comment->comment_post_ID),
+ 'author' => $comment->comment_author,
+ 'author_url' => $comment->comment_author_url,
+ 'author_email' => $comment->comment_author_email,
+ 'author_ip' => $comment->comment_author_IP,
+ 'type' => $comment->comment_type,
+ );
+
+ return apply_filters( 'xmlrpc_prepare_comment', $_comment, $comment );
+ }
+
+ /**
</ins><span class="cx"> * Create a new post for any registered post type.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><span class="lines">@@ -2361,39 +2403,7 @@
</span><span class="cx"> if ( ! $comment = get_comment($comment_id) )
</span><span class="cx"> return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
</span><span class="cx">
</span><del>- // Format page date.
- $comment_date = $this->_convert_date( $comment->comment_date );
- $comment_date_gmt = $this->_convert_date_gmt( $comment->comment_date_gmt, $comment->comment_date );
-
- if ( '0' == $comment->comment_approved )
- $comment_status = 'hold';
- else if ( 'spam' == $comment->comment_approved )
- $comment_status = 'spam';
- else if ( '1' == $comment->comment_approved )
- $comment_status = 'approve';
- else
- $comment_status = $comment->comment_approved;
-
- $link = get_comment_link($comment);
-
- $comment_struct = array(
- 'date_created_gmt' => $comment_date_gmt,
- 'user_id' => $comment->user_id,
- 'comment_id' => $comment->comment_ID,
- 'parent' => $comment->comment_parent,
- 'status' => $comment_status,
- 'content' => $comment->comment_content,
- 'link' => $link,
- 'post_id' => $comment->comment_post_ID,
- 'post_title' => get_the_title($comment->comment_post_ID),
- 'author' => $comment->comment_author,
- 'author_url' => $comment->comment_author_url,
- 'author_email' => $comment->comment_author_email,
- 'author_ip' => $comment->comment_author_IP,
- 'type' => $comment->comment_type,
- );
-
- return $comment_struct;
</del><ins>+ return $this->_prepare_comment( $comment );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2416,13 +2426,12 @@
</span><span class="cx"> * @return array. Contains a collection of comments. See {@link wp_xmlrpc_server::wp_getComment()} for a description of each item contents
</span><span class="cx"> */
</span><span class="cx"> function wp_getComments($args) {
</span><del>- $raw_args = $args;
</del><span class="cx"> $this->escape($args);
</span><span class="cx">
</span><span class="cx"> $blog_id = (int) $args[0];
</span><span class="cx"> $username = $args[1];
</span><span class="cx"> $password = $args[2];
</span><del>- $struct = $args[3];
</del><ins>+ $struct = isset( $args[3] ) ? $args[3] : array();
</ins><span class="cx">
</span><span class="cx"> if ( !$user = $this->login($username, $password) )
</span><span class="cx"> return $this->error;
</span><span class="lines">@@ -2450,19 +2459,11 @@
</span><span class="cx"> $number = absint($struct['number']);
</span><span class="cx">
</span><span class="cx"> $comments = get_comments( array('status' => $status, 'post_id' => $post_id, 'offset' => $offset, 'number' => $number ) );
</span><del>- $num_comments = count($comments);
</del><span class="cx">
</span><del>- if ( ! $num_comments )
- return array();
-
</del><span class="cx"> $comments_struct = array();
</span><span class="cx">
</span><del>- // FIXME: we already have the comments, why query them again?
- for ( $i = 0; $i < $num_comments; $i++ ) {
- $comment = wp_xmlrpc_server::wp_getComment(array(
- $raw_args[0], $raw_args[1], $raw_args[2], $comments[$i]->comment_ID,
- ));
- $comments_struct[] = $comment;
</del><ins>+ foreach ( $comments as $comment ) {
+ $comments_struct[] = $this->_prepare_comment( $comment );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $comments_struct;
</span></span></pre>
</div>
</div>
</body>
</html>