Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-29 00:04:58 +02:00
Code Issues Projects Releases Wiki Activity

In wp_xmlrpc_server methods, for comprehensibility:

Browse Source 
* initialize arrays in loops, instead of overriding an uninitialized array each time
* in `->blogger_getRecentPosts()` and `->mw_getRecentPosts()`, remove the extra loops by only setting one `array`

See #30224.

Built from https://develop.svn.wordpress.org/trunk@30153


git-svn-id: http://core.svn.wordpress.org/trunk@30153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-11-01 19:45:25 +00:00
parent 0ba8ceb6ea
commit be707cd614
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2763,6 +2763,7 @@ class wp_xmlrpc_server extends IXR_Server {
if ( $all_tags = get_tags() ) { if ( $all_tags = get_tags() ) {
foreach( (array) $all_tags as $tag ) { foreach( (array) $all_tags as $tag ) {
$struct = array();
$struct['tag_id'] = $tag->term_id; $struct['tag_id'] = $tag->term_id;
$struct['name'] = $tag->name; $struct['name'] = $tag->name;
$struct['count'] = $tag->count; $struct['count'] = $tag->count;
@ -3220,6 +3221,7 @@ class wp_xmlrpc_server extends IXR_Server {
if ( ! get_post($post_id) ) if ( ! get_post($post_id) )
return new IXR_Error( 404, __( 'Invalid post ID.' ) ); return new IXR_Error( 404, __( 'Invalid post ID.' ) );
$comment = array();
$comment['comment_post_ID'] = $post_id; $comment['comment_post_ID'] = $post_id;
if ( $logged_in ) { if ( $logged_in ) {
@ -3483,6 +3485,7 @@ class wp_xmlrpc_server extends IXR_Server {
if ( !current_user_can( 'manage_options' ) ) if ( !current_user_can( 'manage_options' ) )
return new IXR_Error( 403, __( 'You are not allowed to update options.' ) ); return new IXR_Error( 403, __( 'You are not allowed to update options.' ) );
$option_names = array();
foreach ( $options as $o_name => $o_value ) { foreach ( $options as $o_name => $o_value ) {
$option_names[] = $o_name; $option_names[] = $o_name;
if ( !array_key_exists( $o_name, $this->blog_options ) ) if ( !array_key_exists( $o_name, $this->blog_options ) )
@ -3628,6 +3631,7 @@ class wp_xmlrpc_server extends IXR_Server {
if ( current_theme_supports( 'post-formats' ) ) { if ( current_theme_supports( 'post-formats' ) ) {
$supported = get_theme_support( 'post-formats' ); $supported = get_theme_support( 'post-formats' );
$data = array();
$data['all'] = $formats; $data['all'] = $formats;
$data['supported'] = $supported[0]; $data['supported'] = $supported[0];
@ -4074,6 +4078,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
} }
$recent_posts = array();
foreach ($posts_list as $entry) { foreach ($posts_list as $entry) {
if ( !current_user_can( 'edit_post', $entry['ID'] ) ) if ( !current_user_can( 'edit_post', $entry['ID'] ) )
continue; continue;
@ -4085,18 +4090,12 @@ class wp_xmlrpc_server extends IXR_Server {
$content .= '<category>'.$categories.'</category>'; $content .= '<category>'.$categories.'</category>';
$content .= wp_unslash($entry['post_content']); $content .= wp_unslash($entry['post_content']);
$struct[] = array( $recent_posts[] = array(
'userid' => $entry['post_author'], 'userid' => $entry['post_author'],
'dateCreated' => $post_date, 'dateCreated' => $post_date,
'content' => $content, 'content' => $content,
'postid' => (string) $entry['ID'], 'postid' => (string) $entry['ID'],
); );
}
$recent_posts = array();
for ( $j=0; $j<count($struct); $j++ ) {
array_push($recent_posts, $struct[$j]);
} }
return $recent_posts; return $recent_posts;
@ -5102,7 +5101,7 @@ class wp_xmlrpc_server extends IXR_Server {
if ( !$posts_list ) if ( !$posts_list )
return array(); return array();
$struct = array(); $recent_posts = array();
foreach ($posts_list as $entry) { foreach ($posts_list as $entry) {
if ( !current_user_can( 'edit_post', $entry['ID'] ) ) if ( !current_user_can( 'edit_post', $entry['ID'] ) )
continue; continue;
@ -5146,7 +5145,7 @@ class wp_xmlrpc_server extends IXR_Server {
if ( empty( $post_format ) ) if ( empty( $post_format ) )
$post_format = 'standard'; $post_format = 'standard';
$struct[] = array( $recent_posts[] = array(
'dateCreated' => $post_date, 'dateCreated' => $post_date,
'userid' => $entry['post_author'], 'userid' => $entry['post_author'],
'postid' => (string) $entry['ID'], 'postid' => (string) $entry['ID'],
@ -5174,15 +5173,8 @@ class wp_xmlrpc_server extends IXR_Server {
'date_modified' => $post_modified, 'date_modified' => $post_modified,
'date_modified_gmt' => $post_modified_gmt, 'date_modified_gmt' => $post_modified_gmt,
'sticky' => ( $entry['post_type'] === 'post' && is_sticky( $entry['ID'] ) ), 'sticky' => ( $entry['post_type'] === 'post' && is_sticky( $entry['ID'] ) ),
'wp_post_thumbnail' => get_post_thumbnail_id( $entry['ID'] )
); );
$entry_index = count( $struct ) - 1;
$struct[ $entry_index ][ 'wp_post_thumbnail' ] = get_post_thumbnail_id( $entry['ID'] );
}
$recent_posts = array();
for ( $j=0; $j<count($struct); $j++ ) {
array_push($recent_posts, $struct[$j]);
} }
return $recent_posts; return $recent_posts;
@ -5216,6 +5208,7 @@ class wp_xmlrpc_server extends IXR_Server {
if ( $cats = get_categories(array('get' => 'all')) ) { if ( $cats = get_categories(array('get' => 'all')) ) {
foreach ( $cats as $cat ) { foreach ( $cats as $cat ) {
$struct = array();
$struct['categoryId'] = $cat->term_id; $struct['categoryId'] = $cat->term_id;
$struct['parentId'] = $cat->parent; $struct['parentId'] = $cat->parent;
$struct['description'] = $cat->name; $struct['description'] = $cat->name;
@ -5436,6 +5429,7 @@ class wp_xmlrpc_server extends IXR_Server {
if ( $cats = get_categories(array('hide_empty' => 0, 'hierarchical' => 0)) ) { if ( $cats = get_categories(array('hide_empty' => 0, 'hierarchical' => 0)) ) {
foreach ( $cats as $cat ) { foreach ( $cats as $cat ) {
$struct = array();
$struct['categoryId'] = $cat->term_id; $struct['categoryId'] = $cat->term_id;
$struct['categoryName'] = $cat->name; $struct['categoryName'] = $cat->name;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-alpha-30152'; $wp_version = '4.1-alpha-30153';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.