<!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>[20608] trunk/wp-includes/class-wp-xmlrpc-server.php: XML-RPC featured image and media preparation cleanup.</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/20608">20608</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-04-26 20:56:52 +0000 (Thu, 26 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>XML-RPC featured image and media preparation cleanup.
* Introduce _prepare_media_item().
* Use it to prepare post_thumbnail info in _prepare_post().
* Also use _prepare_media_item() in wp_getMediaLibrary() and wp_getMediaItem() so that all media is prepared consistently and uses the same filters.
Props maxcutler
Fixes <a href="http://core.trac.wordpress.org/ticket/20409">#20409</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 (20607 => 20608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2012-04-26 16:28:06 UTC (rev 20607)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2012-04-26 20:56:52 UTC (rev 20608)
</span><span class="lines">@@ -594,9 +594,13 @@
</span><span class="cx"> 'sticky' => ( $post['post_type'] === 'post' && is_sticky( $post['ID'] ) ),
</span><span class="cx"> );
</span><span class="cx">
</span><del>- //
- $post_fields['post_thumbnail'] = get_post_meta( $post['ID'], '_thumbnail_id', true );
- $post_fields['post_thumbnail_url'] = wp_get_attachment_url( $post_fields['post_thumbnail'] );
</del><ins>+ // Thumbnail
+ $post_fields['post_thumbnail'] = array();
+ $thumbnail_id = get_post_thumbnail_id( $post['ID'] );
+ if ( $thumbnail_id ) {
+ $thumbnail_size = current_theme_supports('post-thumbnail') ? 'post-thumbnail' : 'thumbnail';
+ $post_fields['post_thumbnail'] = $this->_prepare_media_item( get_post( $thumbnail_id ), $thumbnail_size );
+ }
</ins><span class="cx">
</span><span class="cx"> // Consider future posts as published
</span><span class="cx"> if ( $post_fields['post_status'] === 'future' )
</span><span class="lines">@@ -701,6 +705,36 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Prepares media item data for return in an XML-RPC object.
+ *
+ * @access protected
+ *
+ * @param object $media_item The unprepared media item data
+ * @param string $size The image size to use for the thumbnail URL
+ * @return array The prepared media item data
+ */
+ protected function _prepare_media_item( $media_item, $thumbnail_size='thumbnail' ) {
+ $_media_item = array(
+ 'attachment_id' => strval( $media_item->ID ),
+ 'date_created_gmt' => $this->_convert_date_gmt( $media_item->post_date_gmt, $media_item->post_date ),
+ 'parent' => $media_item->post_parent,
+ 'link' => wp_get_attachment_url( $media_item->ID ),
+ 'title' => $media_item->post_title,
+ 'caption' => $media_item->post_excerpt,
+ 'description' => $media_item->post_content,
+ 'metadata' => wp_get_attachment_metadata( $media_item->ID ),
+ );
+
+ $thumbnail_src = image_downsize( $media_item->ID, $thumbnail_size );
+ if ( $thumbnail_src )
+ $_media_item['thumbnail'] = $thumbnail_src[0];
+ else
+ $_media_item['thumbnail'] = $_media_item['link'];
+
+ return apply_filters( 'xmlrpc__prepare_media_item', $_media_item, $media_item, $thumbnail_size );
+ }
+
+ /**
</ins><span class="cx"> * Create a new post for any registered post type.
</span><span class="cx"> *
</span><span class="cx"> * @uses wp_insert_post()
</span><span class="lines">@@ -2818,26 +2852,7 @@
</span><span class="cx"> if ( ! $attachment = get_post($attachment_id) )
</span><span class="cx"> return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
</span><span class="cx">
</span><del>- // Format page date.
- $attachment_date = $this->_convert_date( $attachment->post_date );
- $attachment_date_gmt = $this->_convert_date_gmt( $attachment->post_date_gmt, $attachment->post_date );
-
- $link = wp_get_attachment_url($attachment->ID);
- $thumbnail_link = wp_get_attachment_thumb_url($attachment->ID);
-
- $attachment_struct = array(
- 'date_created_gmt' => $attachment_date_gmt,
- 'parent' => $attachment->post_parent,
- 'link' => $link,
- 'thumbnail' => $thumbnail_link,
- 'title' => $attachment->post_title,
- 'caption' => $attachment->post_excerpt,
- 'description' => $attachment->post_content,
- 'metadata' => wp_get_attachment_metadata($attachment->ID),
- 'attachment_id' => (string) $attachment->ID
- );
-
- return $attachment_struct;
</del><ins>+ return $this->_prepare_media_item( $attachment );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2864,7 +2879,6 @@
</span><span class="cx"> * @return array. Contains a collection of media items. See {@link wp_xmlrpc_server::wp_getMediaItem()} for a description of each item contents
</span><span class="cx"> */
</span><span class="cx"> function wp_getMediaLibrary($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="lines">@@ -2886,15 +2900,11 @@
</span><span class="cx"> $number = ( isset($struct['number']) ) ? absint($struct['number']) : -1 ;
</span><span class="cx">
</span><span class="cx"> $attachments = get_posts( array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type ) );
</span><del>- $num_attachments = count($attachments);
</del><span class="cx">
</span><del>- if ( ! $num_attachments )
- return array();
-
</del><span class="cx"> $attachments_struct = array();
</span><span class="cx">
</span><span class="cx"> foreach ($attachments as $attachment )
</span><del>- $attachments_struct[] = $this->wp_getMediaItem( array( $raw_args[0], $raw_args[1], $raw_args[2], $attachment->ID ) );
</del><ins>+ $attachments_struct[] = $this->_prepare_media_item( $attachment );
</ins><span class="cx">
</span><span class="cx"> return $attachments_struct;
</span><span class="cx"> }
</span><span class="lines">@@ -4208,8 +4218,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty($enclosure) ) $resp['enclosure'] = $enclosure;
</span><span class="cx">
</span><del>- $resp['wp_post_thumbnail'] = get_post_meta( $postdata['ID'], '_thumbnail_id', true );
- $resp['wp_post_thumbnail_url'] = wp_get_attachment_url( $resp['wp_post_thumbnail'] );
</del><ins>+ $resp['wp_post_thumbnail'] = get_post_thumbnail_id( $postdata['ID'] );
</ins><span class="cx">
</span><span class="cx"> return $resp;
</span><span class="cx"> } else {
</span><span class="lines">@@ -4320,8 +4329,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $entry_index = count( $struct ) - 1;
</span><del>- $struct[ $entry_index ][ 'wp_post_thumbnail' ] = get_post_meta( $entry['ID'], '_thumbnail_id', true );
- $struct[ $entry_index ][ 'wp_post_thumbnail_url' ] = wp_get_attachment_url( $struct[ $entry_index ][ 'wp_post_thumbnail' ] );
</del><ins>+ $struct[ $entry_index ][ 'wp_post_thumbnail' ] = get_post_thumbnail_id( $entry['ID'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $recent_posts = array();
</span></span></pre>
</div>
</div>
</body>
</html>