We indent with spaces, not tabs. props sivel. fixes #20394.
git-svn-id: https://develop.svn.wordpress.org/trunk@20703 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
85d0bc608b
commit
0ebf7aec8b
|
@ -490,23 +490,23 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
return $struct;
|
return $struct;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if the method received at least the minimum number of arguments.
|
* Checks if the method received at least the minimum number of arguments.
|
||||||
*
|
*
|
||||||
* @since 3.4
|
* @since 3.4
|
||||||
*
|
*
|
||||||
* @param string|array $args Sanitize single string or array of strings.
|
* @param string|array $args Sanitize single string or array of strings.
|
||||||
* @param int $count Minimum number of arguments.
|
* @param int $count Minimum number of arguments.
|
||||||
* @return boolean if $args contains at least $count arguments.
|
* @return boolean if $args contains at least $count arguments.
|
||||||
*/
|
*/
|
||||||
protected function minimum_args( $args, $count ) {
|
protected function minimum_args( $args, $count ) {
|
||||||
if ( count( $args ) < $count ) {
|
if ( count( $args ) < $count ) {
|
||||||
$this->error = new IXR_Error( 400, __( 'Insufficient arguments passed to this XML-RPC method.' ) );
|
$this->error = new IXR_Error( 400, __( 'Insufficient arguments passed to this XML-RPC method.' ) );
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Prepares taxonomy data for return in an XML-RPC object.
|
* Prepares taxonomy data for return in an XML-RPC object.
|
||||||
|
@ -785,8 +785,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return string post_id
|
* @return string post_id
|
||||||
*/
|
*/
|
||||||
function wp_newPost( $args ) {
|
function wp_newPost( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 4 ) )
|
if ( ! $this->minimum_args( $args, 4 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1062,8 +1062,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return true on success
|
* @return true on success
|
||||||
*/
|
*/
|
||||||
function wp_editPost( $args ) {
|
function wp_editPost( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 5 ) )
|
if ( ! $this->minimum_args( $args, 5 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1117,8 +1117,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return true on success
|
* @return true on success
|
||||||
*/
|
*/
|
||||||
function wp_deletePost( $args ) {
|
function wp_deletePost( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 4 ) )
|
if ( ! $this->minimum_args( $args, 4 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1193,8 +1193,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* - 'enclosure'
|
* - 'enclosure'
|
||||||
*/
|
*/
|
||||||
function wp_getPost( $args ) {
|
function wp_getPost( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 4 ) )
|
if ( ! $this->minimum_args( $args, 4 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1250,8 +1250,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return array contains a collection of posts.
|
* @return array contains a collection of posts.
|
||||||
*/
|
*/
|
||||||
function wp_getPosts( $args ) {
|
function wp_getPosts( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 3 ) )
|
if ( ! $this->minimum_args( $args, 3 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1339,8 +1339,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return string term_id
|
* @return string term_id
|
||||||
*/
|
*/
|
||||||
function wp_newTerm( $args ) {
|
function wp_newTerm( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 4 ) )
|
if ( ! $this->minimum_args( $args, 4 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1426,8 +1426,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return bool True, on success.
|
* @return bool True, on success.
|
||||||
*/
|
*/
|
||||||
function wp_editTerm( $args ) {
|
function wp_editTerm( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 5 ) )
|
if ( ! $this->minimum_args( $args, 5 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1518,8 +1518,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return boolean|IXR_Error If it suceeded true else a reason why not
|
* @return boolean|IXR_Error If it suceeded true else a reason why not
|
||||||
*/
|
*/
|
||||||
function wp_deleteTerm( $args ) {
|
function wp_deleteTerm( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 5 ) )
|
if ( ! $this->minimum_args( $args, 5 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1585,8 +1585,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* - 'count'
|
* - 'count'
|
||||||
*/
|
*/
|
||||||
function wp_getTerm( $args ) {
|
function wp_getTerm( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 5 ) )
|
if ( ! $this->minimum_args( $args, 5 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1638,8 +1638,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return array terms
|
* @return array terms
|
||||||
*/
|
*/
|
||||||
function wp_getTerms( $args ) {
|
function wp_getTerms( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 4 ) )
|
if ( ! $this->minimum_args( $args, 4 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1713,8 +1713,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return array (@see get_taxonomy())
|
* @return array (@see get_taxonomy())
|
||||||
*/
|
*/
|
||||||
function wp_getTaxonomy( $args ) {
|
function wp_getTaxonomy( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 4 ) )
|
if ( ! $this->minimum_args( $args, 4 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -1757,8 +1757,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return array taxonomies
|
* @return array taxonomies
|
||||||
*/
|
*/
|
||||||
function wp_getTaxonomies( $args ) {
|
function wp_getTaxonomies( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 3 ) )
|
if ( ! $this->minimum_args( $args, 3 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -2442,7 +2442,7 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
|
|
||||||
$comments_struct = array();
|
$comments_struct = array();
|
||||||
|
|
||||||
// FIXME: we already have the comments, why query them again?
|
// FIXME: we already have the comments, why query them again?
|
||||||
for ( $i = 0; $i < $num_comments; $i++ ) {
|
for ( $i = 0; $i < $num_comments; $i++ ) {
|
||||||
$comment = wp_xmlrpc_server::wp_getComment(array(
|
$comment = wp_xmlrpc_server::wp_getComment(array(
|
||||||
$raw_args[0], $raw_args[1], $raw_args[2], $comments[$i]->comment_ID,
|
$raw_args[0], $raw_args[1], $raw_args[2], $comments[$i]->comment_ID,
|
||||||
|
@ -3067,8 +3067,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* - 'supports'
|
* - 'supports'
|
||||||
*/
|
*/
|
||||||
function wp_getPostType( $args ) {
|
function wp_getPostType( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 4 ) )
|
if ( ! $this->minimum_args( $args, 4 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
@ -3113,8 +3113,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
function wp_getPostTypes( $args ) {
|
function wp_getPostTypes( $args ) {
|
||||||
if ( ! $this->minimum_args( $args, 3 ) )
|
if ( ! $this->minimum_args( $args, 3 ) )
|
||||||
return $this->error;
|
return $this->error;
|
||||||
|
|
||||||
$this->escape( $args );
|
$this->escape( $args );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue