WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

XMLRPC: Intoduce a date generation helper method to improve the dates returned over XMLRPC when we have a 0 date stored for drafts. 

This improves the ability of clients to work with the new wp Post APIs. See #18429 and #19733 props maxcutler. 


git-svn-id: http://svn.automattic.com/wordpress/trunk@20153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2012-03-08 11:19:53 +00:00
parent d3487222d5
commit 2281ba2229
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wp-includes/class-wp-xmlrpc-server.php
View File

@ -515,6 +515,21 @@ class wp_xmlrpc_server extends IXR_Server {
return apply_filters( 'xmlrpc__prepare_term', $_term, $term ); return apply_filters( 'xmlrpc__prepare_term', $_term, $term );
} }
/**
* Convert a WordPress date string to an IXR_Date object.
*
* @access protected
*
* @param $date
* @return IXR_Date
*/
protected function _convert_date( $date ) {
if ( $date === '0000-00-00 00:00:00' ) {
return new IXR_Date( '00000000T00:00:00Z' );
}
return new IXR_Date( mysql2date( 'Ymd\TH:i:s', $date, false ) );
}
/** /**
* Prepares post data for return in an XML-RPC object. * Prepares post data for return in an XML-RPC object.
* *
@ -526,15 +541,15 @@ class wp_xmlrpc_server extends IXR_Server {
*/ */
protected function _prepare_post( $post, $fields ) { protected function _prepare_post( $post, $fields ) {
// holds the data for this post. built up based on $fields // holds the data for this post. built up based on $fields
$_post = array( 'post_id' => $post['ID'] ); $_post = array( 'post_id' => strval( $post['ID'] ) );
// prepare common post fields // prepare common post fields
$post_fields = array( $post_fields = array(
'post_title' => $post['post_title'], 'post_title' => $post['post_title'],
'post_date' => new IXR_Date( mysql2date( 'Ymd\TH:i:s', $post['post_date'], false ) ), 'post_date' => $this->_convert_date( $post['post_date'] ),
'post_date_gmt' => new IXR_Date( mysql2date( 'Ymd\TH:i:s', $post['post_date_gmt'], false ) ), 'post_date_gmt' => $this->_convert_date( $post['post_date_gmt'] ),
'post_modified' => new IXR_Date( mysql2date( 'Ymd\TH:i:s', $post['post_modified'], false ) ), 'post_modified' => $this->_convert_date( $post['post_modified'] ),
'post_modified_gmt' => new IXR_Date( mysql2date( 'Ymd\TH:i:s', $post['post_modified_gmt'], false ) ), 'post_modified_gmt' => $this->_convert_date( $post['post_modified_gmt'] ),
'post_status' => $post['post_status'], 'post_status' => $post['post_status'],
'post_type' => $post['post_type'], 'post_type' => $post['post_type'],
'post_name' => $post['post_name'], 'post_name' => $post['post_name'],
@ -929,14 +944,14 @@ class wp_xmlrpc_server extends IXR_Server {
return new IXR_Error( 404, __( 'Invalid post ID.' ) ); return new IXR_Error( 404, __( 'Invalid post ID.' ) );
// convert the date field back to IXR form // convert the date field back to IXR form
$post['post_date'] = new IXR_Date( mysql2date( 'Ymd\TH:i:s', $post['post_date'], false ) ); $post['post_date'] = $this->_convert_date( $post['post_date'] );
// ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct, // ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
// since _insert_post will ignore the non-GMT date if the GMT date is set // since _insert_post will ignore the non-GMT date if the GMT date is set
if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) )
unset( $post['post_date_gmt'] ); unset( $post['post_date_gmt'] );
else else
$post['post_date_gmt'] = new IXR_Date( mysql2date( 'Ymd\TH:i:s', $post['post_date_gmt'], false ) ); $post['post_date_gmt'] = $this->_convert_date( $post['post_date_gmt'] );
$this->escape( $post ); $this->escape( $post );
$merged_content_struct = array_merge( $post, $content_struct ); $merged_content_struct = array_merge( $post, $content_struct );