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

Fix inline documentation syntax in `wp_xmlrpc_server`. 

See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-05-25 06:25:25 +00:00
parent bd8fafea54
commit 4c37f68b79
10 changed files with 616 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/includes/ajax-actions.php
View File

@ -2902,6 +2902,7 @@ function wp_ajax_update_plugin() {
'oldVersion' => '', 'oldVersion' => '',
'newVersion' => '', 'newVersion' => '',
); );
$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ); $plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
if ( $plugin_data['Version'] ) { if ( $plugin_data['Version'] ) {
$status['oldVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] ); $status['oldVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
@ -2921,10 +2922,15 @@ function wp_ajax_update_plugin() {
wp_update_plugins(); wp_update_plugins();
} }
$upgrader = new Plugin_Upgrader( new Automatic_Upgrader_Skin() ); $skin = new Automatic_Upgrader_Skin();
$upgrader = new Plugin_Upgrader( $skin );
$result = $upgrader->bulk_upgrade( array( $plugin ) ); $result = $upgrader->bulk_upgrade( array( $plugin ) );
if ( is_array( $result ) ) { if ( is_array( $result ) && empty( $result[$plugin] ) && is_wp_error( $skin->result ) ) {
$result = $skin->result;
}
if ( is_array( $result ) && !empty( $result[ $plugin ] ) ) {
$plugin_update_data = current( $result ); $plugin_update_data = current( $result );
/* /*
@ -2939,7 +2945,8 @@ function wp_ajax_update_plugin() {
wp_send_json_error( $status ); wp_send_json_error( $status );
} }
$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ); $plugin_data = get_plugins( '/' . $result[ $plugin ]['destination_name'] );
$plugin_data = reset( $plugin_data );
if ( $plugin_data['Version'] ) { if ( $plugin_data['Version'] ) {
$status['newVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] ); $status['newVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );

2
wp-admin/options-discussion.php
View File

@ -66,7 +66,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<br /> <br />
<label for="default_ping_status"> <label for="default_ping_status">
<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> /> <input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> />
<?php _e('Allow link notifications from other blogs (pingbacks and trackbacks)'); ?></label> <?php _e('Allow link notifications from other blogs (pingbacks and trackbacks) on new articles'); ?></label>
<br /> <br />
<label for="default_comment_status"> <label for="default_comment_status">
<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> /> <input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />

9
wp-cron.php
View File

@ -64,7 +64,9 @@ $gmt_time = microtime( true );
if ( isset($keys[0]) && $keys[0] > $gmt_time ) if ( isset($keys[0]) && $keys[0] > $gmt_time )
die(); die();
$doing_cron_transient = get_transient( 'doing_cron');
// The cron lock: a unix timestamp from when the cron was spawned.
$doing_cron_transient = get_transient( 'doing_cron' );
// Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock. // Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock.
if ( empty( $doing_wp_cron ) ) { if ( empty( $doing_wp_cron ) ) {
@ -79,7 +81,10 @@ if ( empty( $doing_wp_cron ) ) {
} }
} }
// Check lock /*
* The cron lock (a unix timestamp set when the cron was spawned),
* must match $doing_wp_cron (the "key").
*/
if ( $doing_cron_transient != $doing_wp_cron ) if ( $doing_cron_transient != $doing_wp_cron )
return; return;

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

@ -200,7 +200,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters. * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $number1 A number to add. * @type int $number1 A number to add.
* @type int $number2 A second number to add. * @type int $number2 A second number to add.
@ -512,7 +512,7 @@ class wp_xmlrpc_server extends IXR_Server {
'option' => 'default_comment_status' 'option' => 'default_comment_status'
), ),
'default_ping_status' => array( 'default_ping_status' => array(
'desc' => __( 'Allow link notifications from other blogs (pingbacks and trackbacks)' ), 'desc' => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ),
'readonly' => false, 'readonly' => false,
'option' => 'default_ping_status' 'option' => 'default_ping_status'
) )
@ -534,7 +534,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.6.0 * @since 2.6.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type string $username Username. * @type string $username Username.
* @type string $password Password. * @type string $password Password.
@ -1100,33 +1100,47 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @param array $args { * @link http://en.wikipedia.org/wiki/RSS_enclosure for information on RSS enclosures.
* Method parameters, in this order:
* *
* @type int $blog_id (unused) * @param array $args {
* @type string $username * Method arguments. Note: top-level arguments must be ordered as documented.
* @type string $password *
* @type array $content_struct can contain: * @type int $blog_id Blog ID (unused).
* - post_type (default: 'post') * @type string $username Username.
* - post_status (default: 'draft') * @type string $password Password.
* - post_title * @type array $content_struct {
* - post_author * Content struct for adding a new post. See wp_insert_post() for information on
* - post_excerpt * additional post fields
* - post_content *
* - post_date_gmt | post_date * @type string $post_type Post type. Default 'post'.
* - post_format * @type string $post_status Post status. Default 'draft'
* - post_password * @type string $post_title Post title.
* - comment_status - can be 'open' | 'closed' * @type int $post_author Post author ID.
* - ping_status - can be 'open' | 'closed' * @type string $post_excerpt Post excerpt.
* - sticky * @type string $post_content Post content.
* - post_thumbnail - ID of a media item to use as the post thumbnail/featured image * @type string $post_date_gmt Post date in GMT.
* - custom_fields - array, with each element containing 'key' and 'value' * @type string $post_date Post date.
* - terms - array, with taxonomy names as keys and arrays of term IDs as values * @type string $post_password Post password (20-character limit).
* - terms_names - array, with taxonomy names as keys and arrays of term names as values * @type string $comment_status Post comment enabled status. Accepts 'open' or 'closed'.
* - enclosure * @type string $ping_status Post ping status. Accepts 'open' or 'closed'.
* - any other fields supported by wp_insert_post() * @type bool $sticky Whether the post should be sticky. Automatically false if
* `$post_status` is 'private'.
* @type int $post_thumbnail ID of an image to use as the post thumbnail/featured image.
* @type array $custom_fields Array of meta key/value pairs to add to the post.
* @type array $terms Associative array with taxonomy names as keys and arrays
* of term IDs as values.
* @type array $terms_names Associative array with taxonomy names as keys and arrays
* of term names as values.
* @type array $enclosure {
* Array of feed enclosure data to add to post meta.
*
* @type string $url URL for the feed enclosure.
* @type int $length Size in bytes of the enclosure.
* @type string $type Mime-type for the enclosure.
* } * }
* @return string|IXR_Error post_id * }
* }
* @return int|IXR_Error Post ID on success, IXR_Error instance otherwise.
*/ */
public function wp_newPost( $args ) { public function wp_newPost( $args ) {
if ( ! $this->minimum_args( $args, 4 ) ) if ( ! $this->minimum_args( $args, 4 ) )
@ -1435,7 +1449,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 3.4.0 * @since 3.4.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id Blog ID (unused). * @type int $blog_id Blog ID (unused).
* @type string $username Username. * @type string $username Username.
@ -1474,11 +1488,13 @@ class wp_xmlrpc_server extends IXR_Server {
} }
} }
// convert the date field back to IXR form // Convert the date field back to IXR form.
$post['post_date'] = $this->_convert_date( $post['post_date'] ); $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, /*
// since _insert_post will ignore the non-GMT date if the GMT date is set * 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.
*/
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
@ -1499,17 +1515,17 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @uses wp_delete_post() * @see wp_delete_post()
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id Blog ID (unused).
* @type string $username * @type string $username Username.
* @type string $password * @type string $password Password.
* @type int $post_id * @type int $post_id Post ID.
* } * }
* @return true|IXR_Error true on success * @return true|IXR_Error True on success, IXR_Error instance on failure.
*/ */
public function wp_deletePost( $args ) { public function wp_deletePost( $args ) {
if ( ! $this->minimum_args( $args, 4 ) ) if ( ! $this->minimum_args( $args, 4 ) )
@ -1556,13 +1572,17 @@ class wp_xmlrpc_server extends IXR_Server {
* groups are 'post' (all basic fields), 'taxonomies', 'custom_fields', * groups are 'post' (all basic fields), 'taxonomies', 'custom_fields',
* and 'enclosure'. * and 'enclosure'.
* *
* @uses get_post() * @see get_post()
* @param array $args Method parameters. Contains: *
* - int $blog_id (unused) * @param array $args {
* - string $username * Method arguments. Note: arguments must be ordered as documented.
* - string $password *
* - int $post_id * @type int $blog_id Blog ID (unused).
* - array $fields optional * @type string $username Username.
* @type string $password Password.
* @type int $post_id Post ID.
* @type array $fields The subset of post type fields to return.
* }
* @return array|IXR_Error Array contains (based on $fields parameter): * @return array|IXR_Error Array contains (based on $fields parameter):
* - 'post_id' * - 'post_id'
* - 'post_title' * - 'post_title'
@ -1605,7 +1625,7 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @param array $fields Array of post fields. * @param array $fields Array of post fields. Default array contains 'post', 'terms', and 'custom_fields'.
* @param string $method Method name. * @param string $method Method name.
*/ */
$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPost' ); $fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPost' );
@ -1633,23 +1653,21 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* The optional $filter parameter modifies the query used to retrieve posts. * @see wp_get_recent_posts()
* Accepted keys are 'post_type', 'post_status', 'number', 'offset', * @see wp_getPost() for more on `$fields`
* 'orderby', and 'order'. * @see get_posts() for more on `$filter` values
* *
* The optional $fields parameter specifies what fields will be included * @param array $args {
* in the response array. * Method arguments. Note: arguments must be ordered as documented.
* *
* @uses wp_get_recent_posts() * @type int $blog_id Blog ID (unused).
* @see wp_getPost() for more on $fields * @type string $username Username.
* @see get_posts() for more on $filter values * @type string $password Password.
* * @type array $filter Optional. Modifies the query used to retrieve posts. Accepts 'post_type',
* @param array $args Method parameters. Contains: * 'post_status', 'number', 'offset', 'orderby', and 'order'.
* - int $blog_id (unused) * Default empty array.
* - string $username * @type array $fields Optional. The subset of post type fields to return in the response array.
* - string $password * }
* - array $filter optional
* - array $fields optional
* @return array|IXR_Error Array contains a collection of posts. * @return array|IXR_Error Array contains a collection of posts.
*/ */
public function wp_getPosts( $args ) { public function wp_getPosts( $args ) {
@ -1715,7 +1733,7 @@ class wp_xmlrpc_server extends IXR_Server {
if ( ! $posts_list ) if ( ! $posts_list )
return array(); return array();
// holds all the posts data // Holds all the posts data.
$struct = array(); $struct = array();
foreach ( $posts_list as $post ) { foreach ( $posts_list as $post ) {
@ -1733,20 +1751,19 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @uses wp_insert_term() * @see wp_insert_term()
* @param array $args Method parameters. Contains: *
* - int $blog_id (unused) * @param array $args {
* - string $username * Method arguments. Note: arguments must be ordered as documented.
* - string $password *
* - array $content_struct * @type int $blog_id Blog ID (unused).
* The $content_struct must contain: * @type string $username Username.
* - 'name' * @type string $password Password.
* - 'taxonomy' * @type array $content_struct Content struct for adding a new term. The struct must contain
* Also, it can optionally contain: * the term 'name' and 'taxonomy'. Optional accepted values include
* - 'parent' * 'parent', 'description', and 'slug'.
* - 'description' * }
* - 'slug' * @return int|IXR_Error The term ID on success, or an IXR_Error object on failure.
* @return string|IXR_Error term_id
*/ */
public function wp_newTerm( $args ) { public function wp_newTerm( $args ) {
if ( ! $this->minimum_args( $args, 4 ) ) if ( ! $this->minimum_args( $args, 4 ) )
@ -1819,21 +1836,20 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @uses wp_update_term() * @see wp_update_term()
* @param array $args Method parameters. Contains: *
* - int $blog_id (unused) * @param array $args {
* - string $username * Method arguments. Note: arguments must be ordered as documented.
* - string $password *
* - string $term_id * @type int $blog_id Blog ID (unused).
* - array $content_struct * @type string $username Username.
* The $content_struct must contain: * @type string $password Password.
* - 'taxonomy' * @type int $term_id Term ID.
* Also, it can optionally contain: * @type array $content_struct Content struct for editing a term. The struct must contain the
* - 'name' * term ''taxonomy'. Optional accepted values include 'name', 'parent',
* - 'parent' * 'description', and 'slug'.
* - 'description' * }
* - 'slug' * @return true|IXR_Error True on success, IXR_Error instance on failure.
* @return true|IXR_Error True, on success.
*/ */
public function wp_editTerm( $args ) { public function wp_editTerm( $args ) {
if ( ! $this->minimum_args( $args, 5 ) ) if ( ! $this->minimum_args( $args, 5 ) )
@ -1918,18 +1934,18 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @uses wp_delete_term() * @see wp_delete_term()
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id Blog ID (unused).
* @type string $username * @type string $username Username.
* @type string $password * @type string $password Password.
* @type string $taxnomy_name * @type string $taxnomy_name Taxonomy name.
* @type string $term_id * @type int $term_id Term ID.
* } * }
* @return bool|IXR_Error If it suceeded true else a reason why not * @return bool|IXR_Error True on success, IXR_Error instance on failure.
*/ */
public function wp_deleteTerm( $args ) { public function wp_deleteTerm( $args ) {
if ( ! $this->minimum_args( $args, 5 ) ) if ( ! $this->minimum_args( $args, 5 ) )
@ -1980,18 +1996,18 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @uses get_term() * @see get_term()
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id Blog ID (unused).
* @type string $username * @type string $username Username.
* @type string $password * @type string $password Password.
* @type string $taxnomy * @type string $taxnomy Taxonomy name.
* @type string $term_id * @type string $term_id Term ID.
* } * }
* @return array|IXR_Error Array contains: * @return array|IXR_Error IXR_Error on failure, array on success, containing:
* - 'term_id' * - 'term_id'
* - 'name' * - 'name'
* - 'slug' * - 'slug'
@ -2046,18 +2062,19 @@ class wp_xmlrpc_server extends IXR_Server {
* The optional $filter parameter modifies the query used to retrieve terms. * The optional $filter parameter modifies the query used to retrieve terms.
* Accepted keys are 'number', 'offset', 'orderby', 'order', 'hide_empty', and 'search'. * Accepted keys are 'number', 'offset', 'orderby', 'order', 'hide_empty', and 'search'.
* *
* @uses get_terms() * @see get_terms()
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id Blog ID (unused).
* @type string $username * @type string $username Username.
* @type string $password * @type string $password Password.
* @type string $taxnomy * @type string $taxnomy Taxonomy name.
* @type array $filter (optional) * @type array $filter Optional. Modifies the query used to retrieve posts. Accepts 'number',
* 'offset', 'orderby', 'order', 'hide_empty', and 'search'. Default empty array.
* } * }
* @return array|IXR_Error terms * @return array|IXR_Error An associative array of terms data on success, IXR_Error instance otherwise.
*/ */
public function wp_getTerms( $args ) { public function wp_getTerms( $args ) {
if ( ! $this->minimum_args( $args, 4 ) ) if ( ! $this->minimum_args( $args, 4 ) )
@ -2126,18 +2143,20 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @uses get_taxonomy() * @see get_taxonomy()
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id Blog ID (unused).
* @type string $username * @type string $username Username.
* @type string $password * @type string $password Password.
* @type string $taxnomy * @type string $taxnomy Taxonomy name.
* @type array $fields (optional) * @type array $fields Optional. Array of taxonomy fields to limit to in the return.
* Accepts 'labels', 'cap', 'menu', and 'object_type'.
* Default empty array.
* } * }
* @return array|IXR_Error (@see get_taxonomy()) * @return array|IXR_Error An array of taxonomy data on success, IXR_Error instance otherwise.
*/ */
public function wp_getTaxonomy( $args ) { public function wp_getTaxonomy( $args ) {
if ( ! $this->minimum_args( $args, 4 ) ) if ( ! $this->minimum_args( $args, 4 ) )
@ -2185,16 +2204,19 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @uses get_taxonomies() * @see get_taxonomies()
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id Blog ID (unused).
* @type string $username * @type string $username Username.
* @type string $password * @type string $password Password.
* @type array $filter Optional. An array of arguments for retrieving taxonomies.
* @type array $fields Optional. The subset of taxonomy fields to return.
* } * }
* @return array taxonomies * @return array|IXR_Error An associative array of taxonomy data with returned fields determined
* by `$fields`, or an IXR_Error instance on failure.
*/ */
public function wp_getTaxonomies( $args ) { public function wp_getTaxonomies( $args ) {
if ( ! $this->minimum_args( $args, 3 ) ) if ( ! $this->minimum_args( $args, 3 ) )
@ -2249,7 +2271,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @uses get_userdata() * @uses get_userdata()
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2326,7 +2348,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @see wp_getUser() for more on $fields and return values * @see wp_getUser() for more on $fields and return values
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2401,7 +2423,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @uses get_userdata() * @uses get_userdata()
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2446,7 +2468,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @uses wp_update_user() * @uses wp_update_user()
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2524,7 +2546,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.2.0 * @since 2.2.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type int $page_id * @type int $page_id
@ -2570,7 +2592,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.2.0 * @since 2.2.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2618,9 +2640,10 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 2.2.0 * @since 2.2.0
* *
* @see wp_xmlrpc_server::mw_newPost()
*
* @param array $args { * @param array $args {
* See {@link wp_xmlrpc_server::mw_newPost()} * Method arguments. Note: arguments must be ordered as documented.
* Method parameters, in this order:
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2653,7 +2676,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.2.0 * @since 2.2.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2709,7 +2732,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.2.0 * @since 2.2.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type int $page_id * @type int $page_id
@ -2767,7 +2790,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @global wpdb $wpdb * @global wpdb $wpdb
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2825,7 +2848,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.2.0 * @since 2.2.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2866,7 +2889,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.7.0 * @since 2.7.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2914,7 +2937,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.2.0 * @since 2.2.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -2990,7 +3013,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.5.0 * @since 2.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3038,7 +3061,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.2.0 * @since 2.2.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3083,7 +3106,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.7.0 * @since 2.7.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3131,7 +3154,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.7.0 * @since 2.7.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3194,7 +3217,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.7.0 * @since 2.7.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3254,12 +3277,12 @@ class wp_xmlrpc_server extends IXR_Server {
* - 'author_email' * - 'author_email'
* - 'content' * - 'content'
* - 'date_created_gmt' * - 'date_created_gmt'
* - 'status'. Common statuses are 'approve', 'hold', 'spam'. See {@link get_comment_statuses()} for more details * - 'status'. Common statuses are 'approve', 'hold', 'spam'. See get_comment_statuses() for more details
* *
* @since 2.7.0 * @since 2.7.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3267,12 +3290,6 @@ class wp_xmlrpc_server extends IXR_Server {
* @type int $comment_ID * @type int $comment_ID
* @type array $content_struct * @type array $content_struct
* } * }
* @param array $args Contains:
* - blog_id (unused)
* - username
* - password
* - comment_id
* - content_struct
* @return true|IXR_Error True, on success. * @return true|IXR_Error True, on success.
*/ */
public function wp_editComment( $args ) { public function wp_editComment( $args ) {
@ -3356,7 +3373,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.7.0 * @since 2.7.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3467,7 +3484,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.7.0 * @since 2.7.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3499,7 +3516,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.5.0 * @since 2.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3539,7 +3556,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.5.0 * @since 2.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3571,7 +3588,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.5.0 * @since 2.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3603,7 +3620,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.6.0 * @since 2.6.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3635,7 +3652,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.6.0 * @since 2.6.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3695,7 +3712,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 2.6.0 * @since 2.6.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3739,7 +3756,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 3.1.0 * @since 3.1.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3788,21 +3805,21 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* The defaults are as follows: * The defaults are as follows:
* - 'number' - Default is 5. Total number of media items to retrieve. * - 'number' - Default is 5. Total number of media items to retrieve.
* - 'offset' - Default is 0. See {@link WP_Query::query()} for more. * - 'offset' - Default is 0. See WP_Query::query() for more.
* - 'parent_id' - Default is ''. The post where the media item is attached. Empty string shows all media items. 0 shows unattached media items. * - 'parent_id' - Default is ''. The post where the media item is attached. Empty string shows all media items. 0 shows unattached media items.
* - 'mime_type' - Default is ''. Filter by mime type (e.g., 'image/jpeg', 'application/pdf') * - 'mime_type' - Default is ''. Filter by mime type (e.g., 'image/jpeg', 'application/pdf')
* *
* @since 3.1.0 * @since 3.1.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
* @type string $password * @type string $password
* @type array $struct * @type array $struct
* } * }
* @return array|IXR_Error Contains a collection of media items. See {@link wp_xmlrpc_server::wp_getMediaItem()} for a description of each item contents * @return array|IXR_Error Contains a collection of media items. See wp_xmlrpc_server::wp_getMediaItem() for a description of each item contents
*/ */
public function wp_getMediaLibrary($args) { public function wp_getMediaLibrary($args) {
$this->escape($args); $this->escape($args);
@ -3841,7 +3858,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 3.1.0 * @since 3.1.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3889,9 +3906,10 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @uses get_post_type_object() * @see get_post_type_object()
*
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -3956,9 +3974,10 @@ class wp_xmlrpc_server extends IXR_Server {
* *
* @since 3.4.0 * @since 3.4.0
* *
* @uses get_post_types() * @see get_post_types()
*
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -4017,7 +4036,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @see wp_getPost() for more on $fields * @see wp_getPost() for more on $fields
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -4096,7 +4115,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @uses wp_restore_post_revision() * @uses wp_restore_post_revision()
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -4154,7 +4173,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -4229,7 +4248,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -4269,7 +4288,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type int $post_ID * @type int $post_ID
@ -4320,7 +4339,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type string $appkey (unused) * @type string $appkey (unused)
* @type int $blog_id (unused) * @type int $blog_id (unused)
@ -4409,7 +4428,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type string $appkey (unused) * @type string $appkey (unused)
* @type int $blog_id (unused) * @type int $blog_id (unused)
@ -4479,7 +4498,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type int $post_ID * @type int $post_ID
@ -4554,7 +4573,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type int $post_ID * @type int $post_ID
@ -4634,7 +4653,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -4973,7 +4992,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -5000,9 +5019,10 @@ class wp_xmlrpc_server extends IXR_Server {
$postdata = get_post( $post_ID, ARRAY_A ); $postdata = get_post( $post_ID, ARRAY_A );
// If there is no post data for the give post id, stop /*
// now and return an error. Other wise a new post will be * If there is no post data for the give post id, stop now and return an error.
// created (which was the old behavior). * Otherwise a new post will be created (which was the old behavior).
*/
if ( ! $postdata || empty( $postdata[ 'ID' ] ) ) if ( ! $postdata || empty( $postdata[ 'ID' ] ) )
return new IXR_Error( 404, __( 'Invalid post ID.' ) ); return new IXR_Error( 404, __( 'Invalid post ID.' ) );
@ -5195,9 +5215,9 @@ class wp_xmlrpc_server extends IXR_Server {
$to_ping = implode(' ', $to_ping); $to_ping = implode(' ', $to_ping);
} }
// Do some timestamp voodoo // Do some timestamp voodoo.
if ( !empty( $content_struct['date_created_gmt'] ) ) if ( !empty( $content_struct['date_created_gmt'] ) )
// We know this is supposed to be GMT, so we're going to slap that Z on there by force // We know this is supposed to be GMT, so we're going to slap that Z on there by force.
$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z'; $dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
elseif ( !empty( $content_struct['dateCreated']) ) elseif ( !empty( $content_struct['dateCreated']) )
$dateCreated = $content_struct['dateCreated']->getIso(); $dateCreated = $content_struct['dateCreated']->getIso();
@ -5210,7 +5230,7 @@ class wp_xmlrpc_server extends IXR_Server {
$post_date_gmt = $postdata['post_date_gmt']; $post_date_gmt = $postdata['post_date_gmt'];
} }
// We've got all the data -- post it: // We've got all the data -- post it.
$newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template'); $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template');
$result = wp_update_post($newpost, true); $result = wp_update_post($newpost, true);
@ -5232,7 +5252,8 @@ class wp_xmlrpc_server extends IXR_Server {
$this->set_custom_fields($post_ID, $content_struct['custom_fields']); $this->set_custom_fields($post_ID, $content_struct['custom_fields']);
if ( isset ( $content_struct['wp_post_thumbnail'] ) ) { if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
// empty value deletes, non-empty value adds/updates
// Empty value deletes, non-empty value adds/updates.
if ( empty( $content_struct['wp_post_thumbnail'] ) ) { if ( empty( $content_struct['wp_post_thumbnail'] ) ) {
delete_post_thumbnail( $post_ID ); delete_post_thumbnail( $post_ID );
} else { } else {
@ -5242,14 +5263,13 @@ class wp_xmlrpc_server extends IXR_Server {
unset( $content_struct['wp_post_thumbnail'] ); unset( $content_struct['wp_post_thumbnail'] );
} }
// Handle enclosures // Handle enclosures.
$thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null; $thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
$this->add_enclosure_if_new($post_ID, $thisEnclosure); $this->add_enclosure_if_new($post_ID, $thisEnclosure);
$this->attach_uploads( $ID, $post_content ); $this->attach_uploads( $ID, $post_content );
// Handle post formats if assigned, validation is handled // Handle post formats if assigned, validation is handled earlier in this function.
// earlier in this function
if ( isset( $content_struct['wp_post_format'] ) ) if ( isset( $content_struct['wp_post_format'] ) )
set_post_format( $post_ID, $content_struct['wp_post_format'] ); set_post_format( $post_ID, $content_struct['wp_post_format'] );
@ -5272,7 +5292,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type int $post_ID * @type int $post_ID
@ -5403,7 +5423,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -5521,7 +5541,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -5576,7 +5596,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @global wpdb $wpdb * @global wpdb $wpdb
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -5696,7 +5716,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -5756,7 +5776,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $blog_id (unused) * @type int $blog_id (unused)
* @type string $username * @type string $username
@ -5800,7 +5820,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $post_ID * @type int $post_ID
* @type string $username * @type string $username
@ -5849,7 +5869,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $post_ID * @type int $post_ID
* @type string $username * @type string $username
@ -5969,7 +5989,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @since 1.5.0 * @since 1.5.0
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type int $post_ID * @type int $post_ID
* @type string $username * @type string $username
@ -6020,7 +6040,7 @@ class wp_xmlrpc_server extends IXR_Server {
* @global string $wp_version * @global string $wp_version
* *
* @param array $args { * @param array $args {
* Method parameters, in this order: * Method arguments. Note: arguments must be ordered as documented.
* *
* @type string $pagelinkedfrom * @type string $pagelinkedfrom
* @type string $pagelinkedto * @type string $pagelinkedto

45
wp-includes/comment.php
View File

@ -162,6 +162,7 @@ function get_approved_comments( $post_id, $args = array() ) {
* @since 2.0.0 * @since 2.0.0
* *
* @global wpdb $wpdb WordPress database abstraction object. * @global wpdb $wpdb WordPress database abstraction object.
* @global object $comment
* *
* @param object|string|int $comment Comment to retrieve. * @param object|string|int $comment Comment to retrieve.
* @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants. * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants.
@ -297,7 +298,7 @@ class WP_Comment_Query {
* *
* @param callable $name Method to call. * @param callable $name Method to call.
* @param array $arguments Arguments to pass when calling. * @param array $arguments Arguments to pass when calling.
* @return mixed|bool Return value of the callback, false otherwise. * @return mixed|false Return value of the callback, false otherwise.
*/ */
public function __call( $name, $arguments ) { public function __call( $name, $arguments ) {
if ( 'get_search_sql' === $name ) { if ( 'get_search_sql' === $name ) {
@ -377,7 +378,6 @@ class WP_Comment_Query {
* @type array $type__not_in Exclude comments from a given array of comment types. Default empty. * @type array $type__not_in Exclude comments from a given array of comment types. Default empty.
* @type int $user_id Include comments for a specific user ID. Default empty. * @type int $user_id Include comments for a specific user ID. Default empty.
* } * }
* @return WP_Comment_Query WP_Comment_Query instance.
*/ */
public function __construct( $query = '' ) { public function __construct( $query = '' ) {
$this->query_var_defaults = array( $this->query_var_defaults = array(
@ -469,7 +469,7 @@ class WP_Comment_Query {
* *
* @global wpdb $wpdb WordPress database abstraction object. * @global wpdb $wpdb WordPress database abstraction object.
* *
* @return array The list of comments. * @return int|array The list of comments.
*/ */
public function get_comments() { public function get_comments() {
global $wpdb; global $wpdb;
@ -901,8 +901,10 @@ class WP_Comment_Query {
/** /**
* Used internally to generate an SQL string for searching across multiple columns * Used internally to generate an SQL string for searching across multiple columns
* *
* @access protected
* @since 3.1.0 * @since 3.1.0
* @access protected
*
* @global wpdb $wpdb
* *
* @param string $string * @param string $string
* @param array $cols * @param array $cols
@ -930,7 +932,7 @@ class WP_Comment_Query {
* @global wpdb $wpdb WordPress database abstraction object. * @global wpdb $wpdb WordPress database abstraction object.
* *
* @param string $orderby Alias for the field to order by. * @param string $orderby Alias for the field to order by.
* @return string|bool Value to used in the ORDER clause. False otherwise. * @return string|false Value to used in the ORDER clause. False otherwise.
*/ */
protected function parse_orderby( $orderby ) { protected function parse_orderby( $orderby ) {
global $wpdb; global $wpdb;
@ -1032,6 +1034,7 @@ function get_comment_statuses() {
* @since 1.5.0 * @since 1.5.0
* *
* @global wpdb $wpdb WordPress database abstraction object. * @global wpdb $wpdb WordPress database abstraction object.
* @staticvar array $cache_lastcommentmodified
* *
* @param string $timezone Which timezone to use in reference to 'gmt', 'blog', * @param string $timezone Which timezone to use in reference to 'gmt', 'blog',
* or 'server' locations. * or 'server' locations.
@ -1294,7 +1297,7 @@ function sanitize_comment_cookies() {
* @global wpdb $wpdb WordPress database abstraction object. * @global wpdb $wpdb WordPress database abstraction object.
* *
* @param array $commentdata Contains information on the comment * @param array $commentdata Contains information on the comment
* @return mixed Signifies the approval status (0|1|'spam') * @return int|string Signifies the approval status (0|1|'spam')
*/ */
function wp_allow_comment( $commentdata ) { function wp_allow_comment( $commentdata ) {
global $wpdb; global $wpdb;
@ -1482,6 +1485,8 @@ function separate_comments(&$comments) {
* *
* @uses Walker_Comment * @uses Walker_Comment
* *
* @global WP_Query $wp_query
*
* @param array $comments Optional array of comment objects. Defaults to $wp_query->comments * @param array $comments Optional array of comment objects. Defaults to $wp_query->comments
* @param int $per_page Optional comments per page. * @param int $per_page Optional comments per page.
* @param boolean $threaded Optional control over flat or threaded comments. * @param boolean $threaded Optional control over flat or threaded comments.
@ -1527,6 +1532,8 @@ function get_comment_pages_count( $comments = null, $per_page = null, $threaded
* *
* @since 2.7.0 * @since 2.7.0
* *
* @global wpdb $wpdb
*
* @param int $comment_ID Comment ID. * @param int $comment_ID Comment ID.
* @param array $args Optional args. * @param array $args Optional args.
* @return int|null Comment page number or null on error. * @return int|null Comment page number or null on error.
@ -1649,8 +1656,10 @@ function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_age
* *
* @since 2.5.0 * @since 2.5.0
* *
* @global wpdb $wpdb
*
* @param int $post_id Optional. Post ID. * @param int $post_id Optional. Post ID.
* @return object Comment stats. * @return object|array Comment stats.
*/ */
function wp_count_comments( $post_id = 0 ) { function wp_count_comments( $post_id = 0 ) {
global $wpdb; global $wpdb;
@ -2111,7 +2120,7 @@ function wp_get_current_commenter() {
* @type string $comment_type Comment type. Default empty. * @type string $comment_type Comment type. Default empty.
* @type int $user_id ID of the user who submitted the comment. Default 0. * @type int $user_id ID of the user who submitted the comment. Default 0.
* } * }
* @return int|bool The new comment's ID on success, false on failure. * @return int|false The new comment's ID on success, false on failure.
*/ */
function wp_insert_comment( $commentdata ) { function wp_insert_comment( $commentdata ) {
global $wpdb; global $wpdb;
@ -2260,6 +2269,8 @@ function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment)
* *
* @see wp_insert_comment() * @see wp_insert_comment()
* *
* @global wpdb $wpdb
*
* @param array $commentdata Contains information on the comment. See wp_insert_comment() * @param array $commentdata Contains information on the comment. See wp_insert_comment()
* for information on accepted arguments. * for information on accepted arguments.
* @return int|false The ID of the comment on success, false on failure. * @return int|false The ID of the comment on success, false on failure.
@ -2361,6 +2372,8 @@ function wp_new_comment( $commentdata ) {
* *
* @since 1.0.0 * @since 1.0.0
* *
* global wpdb $wpdb
*
* @param int $comment_id Comment ID. * @param int $comment_id Comment ID.
* @param string $comment_status New comment status, either 'hold', 'approve', 'spam', or 'trash'. * @param string $comment_status New comment status, either 'hold', 'approve', 'spam', or 'trash'.
* @param bool $wp_error Whether to return a WP_Error object if there is a failure. Default is false. * @param bool $wp_error Whether to return a WP_Error object if there is a failure. Default is false.
@ -2547,7 +2560,7 @@ function wp_defer_comment_counting($defer=null) {
* *
* @param int $post_id Post ID * @param int $post_id Post ID
* @param bool $do_deferred Whether to process previously deferred post comment counts * @param bool $do_deferred Whether to process previously deferred post comment counts
* @return bool|null True on success, false on failure * @return bool|void True on success, false on failure
*/ */
function wp_update_comment_count($post_id, $do_deferred=false) { function wp_update_comment_count($post_id, $do_deferred=false) {
static $_deferred = array(); static $_deferred = array();
@ -2790,7 +2803,8 @@ function generic_ping( $post_id = 0 ) {
* Pings back the links found in a post. * Pings back the links found in a post.
* *
* @since 0.71 * @since 0.71
* @uses $wp_version *
* @global string $wp_version
* *
* @param string $content Post content to check for links. * @param string $content Post content to check for links.
* @param int $post_ID Post ID. * @param int $post_ID Post ID.
@ -2903,7 +2917,7 @@ function privacy_ping_filter($sites) {
* @param string $title Title of post. * @param string $title Title of post.
* @param string $excerpt Excerpt of post. * @param string $excerpt Excerpt of post.
* @param int $ID Post ID. * @param int $ID Post ID.
* @return mixed Database query from update. * @return int|false|void Database query from update.
*/ */
function trackback($trackback_url, $title, $excerpt, $ID) { function trackback($trackback_url, $title, $excerpt, $ID) {
global $wpdb; global $wpdb;
@ -2933,7 +2947,8 @@ function trackback($trackback_url, $title, $excerpt, $ID) {
* Send a pingback. * Send a pingback.
* *
* @since 1.2.0 * @since 1.2.0
* @uses $wp_version *
* @global string $wp_version
* *
* @param string $server Host of blog to connect to. * @param string $server Host of blog to connect to.
* @param string $path Path to send the ping. * @param string $path Path to send the ping.
@ -3030,9 +3045,9 @@ function update_comment_cache($comments) {
* @access private * @access private
* @since 2.7.0 * @since 2.7.0
* *
* @param object $posts Post data object. * @param WP_Post $posts Post data object.
* @param object $query Query object. * @param WP_Query $query Query object.
* @return object * @return array
*/ */
function _close_comments_for_old_posts( $posts, $query ) { function _close_comments_for_old_posts( $posts, $query ) {
if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) ) if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )

25
wp-includes/cron.php
View File

@ -18,6 +18,7 @@
* @param int $timestamp Timestamp for when to run the event. * @param int $timestamp Timestamp for when to run the event.
* @param string $hook Action hook to execute when cron is run. * @param string $hook Action hook to execute when cron is run.
* @param array $args Optional. Arguments to pass to the hook's callback function. * @param array $args Optional. Arguments to pass to the hook's callback function.
* @return void|false
*/ */
function wp_schedule_single_event( $timestamp, $hook, $args = array()) { function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
// don't schedule a duplicate if there's already an identical event due within 10 minutes of it // don't schedule a duplicate if there's already an identical event due within 10 minutes of it
@ -66,7 +67,7 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
* @param string $recurrence How often the event should recur. * @param string $recurrence How often the event should recur.
* @param string $hook Action hook to execute when cron is run. * @param string $hook Action hook to execute when cron is run.
* @param array $args Optional. Arguments to pass to the hook's callback function. * @param array $args Optional. Arguments to pass to the hook's callback function.
* @return false|null False on failure, null when complete with scheduling event. * @return false|void False when does not schedule event.
*/ */
function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) { function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
$crons = _get_cron_array(); $crons = _get_cron_array();
@ -99,7 +100,7 @@ function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
* @param string $recurrence How often the event should recur. * @param string $recurrence How often the event should recur.
* @param string $hook Action hook to execute when cron is run. * @param string $hook Action hook to execute when cron is run.
* @param array $args Optional. Arguments to pass to the hook's callback function. * @param array $args Optional. Arguments to pass to the hook's callback function.
* @return false|null False on failure. Null when event is rescheduled. * @return false|void False when does not schedule event.
*/ */
function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) { function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
$crons = _get_cron_array(); $crons = _get_cron_array();
@ -195,7 +196,7 @@ function wp_clear_scheduled_hook( $hook, $args = array() ) {
* *
* @param string $hook Action hook to execute when cron is run. * @param string $hook Action hook to execute when cron is run.
* @param array $args Optional. Arguments to pass to the hook's callback function. * @param array $args Optional. Arguments to pass to the hook's callback function.
* @return bool|int The UNIX timestamp of the next time the scheduled event will occur. * @return false|int The UNIX timestamp of the next time the scheduled event will occur.
*/ */
function wp_next_scheduled( $hook, $args = array() ) { function wp_next_scheduled( $hook, $args = array() ) {
$crons = _get_cron_array(); $crons = _get_cron_array();
@ -213,11 +214,8 @@ function wp_next_scheduled( $hook, $args = array() ) {
* Send request to run cron through HTTP request that doesn't halt page loading. * Send request to run cron through HTTP request that doesn't halt page loading.
* *
* @since 2.1.0 * @since 2.1.0
*
* @return null Cron could not be spawned, because it is not needed to run.
*/ */
function spawn_cron( $gmt_time = 0 ) { function spawn_cron( $gmt_time = 0 ) {
if ( ! $gmt_time ) if ( ! $gmt_time )
$gmt_time = microtime( true ); $gmt_time = microtime( true );
@ -225,8 +223,11 @@ function spawn_cron( $gmt_time = 0 ) {
return; return;
/* /*
* multiple processes on multiple web servers can run this code concurrently * Get the cron lock, which is a unix timestamp of when the last cron was spawned
* try to make this as atomic as possible by setting doing_cron switch * and has not finished running.
*
* Multiple processes on multiple web servers can run this code concurrently,
* this lock attempts to make spawning as atomic as possible.
*/ */
$lock = get_transient('doing_cron'); $lock = get_transient('doing_cron');
@ -266,6 +267,7 @@ function spawn_cron( $gmt_time = 0 ) {
return; return;
} }
// Set the cron lock with the current unix timestamp, when the cron is being spawned.
$doing_wp_cron = sprintf( '%.22F', $gmt_time ); $doing_wp_cron = sprintf( '%.22F', $gmt_time );
set_transient( 'doing_cron', $doing_wp_cron ); set_transient( 'doing_cron', $doing_wp_cron );
@ -306,11 +308,8 @@ function spawn_cron( $gmt_time = 0 ) {
* Run scheduled callbacks or spawn cron for all scheduled events. * Run scheduled callbacks or spawn cron for all scheduled events.
* *
* @since 2.1.0 * @since 2.1.0
*
* @return null When doesn't need to run Cron.
*/ */
function wp_cron() { function wp_cron() {
// Prevent infinite loops caused by lack of wp-cron.php // Prevent infinite loops caused by lack of wp-cron.php
if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) ) if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) )
return; return;
@ -388,7 +387,7 @@ function wp_get_schedules() {
* *
* @param string $hook Action hook to execute when cron is run. * @param string $hook Action hook to execute when cron is run.
* @param array $args Optional. Arguments to pass to the hook's callback function. * @param array $args Optional. Arguments to pass to the hook's callback function.
* @return string|bool False, if no schedule. Schedule on success. * @return string|false False, if no schedule. Schedule on success.
*/ */
function wp_get_schedule($hook, $args = array()) { function wp_get_schedule($hook, $args = array()) {
$crons = _get_cron_array(); $crons = _get_cron_array();
@ -412,7 +411,7 @@ function wp_get_schedule($hook, $args = array()) {
* @since 2.1.0 * @since 2.1.0
* @access private * @access private
* *
* @return array CRON info array. * @return false|array CRON info array.
*/ */
function _get_cron_array() { function _get_cron_array() {
$cron = get_option('cron'); $cron = get_option('cron');

3
wp-includes/default-filters.php
View File

@ -382,6 +382,9 @@ add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings'
// Nav menu // Nav menu
add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 ); add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 );
// Widgets
add_action( 'init', 'wp_widgets_init', 1 );
// Admin Bar // Admin Bar
// Don't remove. Wrong way to disable. // Don't remove. Wrong way to disable.
add_action( 'template_redirect', '_wp_admin_bar_init', 0 ); add_action( 'template_redirect', '_wp_admin_bar_init', 0 );

183
wp-includes/default-widgets.php
View File

@ -18,6 +18,10 @@ class WP_Widget_Pages extends WP_Widget {
parent::__construct('pages', __('Pages'), $widget_ops); parent::__construct('pages', __('Pages'), $widget_ops);
} }
/**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) { public function widget( $args, $instance ) {
/** /**
@ -67,6 +71,11 @@ class WP_Widget_Pages extends WP_Widget {
} }
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = $old_instance; $instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']); $instance['title'] = strip_tags($new_instance['title']);
@ -81,6 +90,9 @@ class WP_Widget_Pages extends WP_Widget {
return $instance; return $instance;
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
//Defaults //Defaults
$instance = wp_parse_args( (array) $instance, array( 'sortby' => 'post_title', 'title' => '', 'exclude' => '') ); $instance = wp_parse_args( (array) $instance, array( 'sortby' => 'post_title', 'title' => '', 'exclude' => '') );
@ -118,8 +130,11 @@ class WP_Widget_Links extends WP_Widget {
parent::__construct('links', __('Links'), $widget_ops); parent::__construct('links', __('Links'), $widget_ops);
} }
/**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) { public function widget( $args, $instance ) {
$show_description = isset($instance['description']) ? $instance['description'] : false; $show_description = isset($instance['description']) ? $instance['description'] : false;
$show_name = isset($instance['name']) ? $instance['name'] : false; $show_name = isset($instance['name']) ? $instance['name'] : false;
$show_rating = isset($instance['rating']) ? $instance['rating'] : false; $show_rating = isset($instance['rating']) ? $instance['rating'] : false;
@ -151,6 +166,11 @@ class WP_Widget_Links extends WP_Widget {
) ) ); ) ) );
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$new_instance = (array) $new_instance; $new_instance = (array) $new_instance;
$instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 ); $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 );
@ -169,6 +189,9 @@ class WP_Widget_Links extends WP_Widget {
return $instance; return $instance;
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
//Defaults //Defaults
@ -227,8 +250,11 @@ class WP_Widget_Search extends WP_Widget {
parent::__construct( 'search', _x( 'Search', 'Search widget' ), $widget_ops ); parent::__construct( 'search', _x( 'Search', 'Search widget' ), $widget_ops );
} }
/**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) { public function widget( $args, $instance ) {
/** This filter is documented in wp-includes/default-widgets.php */ /** This filter is documented in wp-includes/default-widgets.php */
$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
@ -243,6 +269,9 @@ class WP_Widget_Search extends WP_Widget {
echo $args['after_widget']; echo $args['after_widget'];
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '') ); $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
$title = $instance['title']; $title = $instance['title'];
@ -251,6 +280,11 @@ class WP_Widget_Search extends WP_Widget {
<?php <?php
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = $old_instance; $instance = $old_instance;
$new_instance = wp_parse_args((array) $new_instance, array( 'title' => '')); $new_instance = wp_parse_args((array) $new_instance, array( 'title' => ''));
@ -272,6 +306,10 @@ class WP_Widget_Archives extends WP_Widget {
parent::__construct('archives', __('Archives'), $widget_ops); parent::__construct('archives', __('Archives'), $widget_ops);
} }
/**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) { public function widget( $args, $instance ) {
$c = ! empty( $instance['count'] ) ? '1' : '0'; $c = ! empty( $instance['count'] ) ? '1' : '0';
$d = ! empty( $instance['dropdown'] ) ? '1' : '0'; $d = ! empty( $instance['dropdown'] ) ? '1' : '0';
@ -354,6 +392,11 @@ class WP_Widget_Archives extends WP_Widget {
echo $args['after_widget']; echo $args['after_widget'];
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = $old_instance; $instance = $old_instance;
$new_instance = wp_parse_args( (array) $new_instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') ); $new_instance = wp_parse_args( (array) $new_instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
@ -364,6 +407,9 @@ class WP_Widget_Archives extends WP_Widget {
return $instance; return $instance;
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') ); $instance = wp_parse_args( (array) $instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
$title = strip_tags($instance['title']); $title = strip_tags($instance['title']);
@ -394,8 +440,11 @@ class WP_Widget_Meta extends WP_Widget {
parent::__construct('meta', __('Meta'), $widget_ops); parent::__construct('meta', __('Meta'), $widget_ops);
} }
/**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) { public function widget( $args, $instance ) {
/** This filter is documented in wp-includes/default-widgets.php */ /** This filter is documented in wp-includes/default-widgets.php */
$title = apply_filters( 'widget_title', empty($instance['title']) ? __( 'Meta' ) : $instance['title'], $instance, $this->id_base ); $title = apply_filters( 'widget_title', empty($instance['title']) ? __( 'Meta' ) : $instance['title'], $instance, $this->id_base );
@ -430,6 +479,11 @@ class WP_Widget_Meta extends WP_Widget {
echo $args['after_widget']; echo $args['after_widget'];
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = $old_instance; $instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']); $instance['title'] = strip_tags($new_instance['title']);
@ -437,6 +491,9 @@ class WP_Widget_Meta extends WP_Widget {
return $instance; return $instance;
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) ); $instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
$title = strip_tags($instance['title']); $title = strip_tags($instance['title']);
@ -458,8 +515,11 @@ class WP_Widget_Calendar extends WP_Widget {
parent::__construct('calendar', __('Calendar'), $widget_ops); parent::__construct('calendar', __('Calendar'), $widget_ops);
} }
/**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) { public function widget( $args, $instance ) {
/** This filter is documented in wp-includes/default-widgets.php */ /** This filter is documented in wp-includes/default-widgets.php */
$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
@ -473,6 +533,11 @@ class WP_Widget_Calendar extends WP_Widget {
echo $args['after_widget']; echo $args['after_widget'];
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = $old_instance; $instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']); $instance['title'] = strip_tags($new_instance['title']);
@ -480,6 +545,9 @@ class WP_Widget_Calendar extends WP_Widget {
return $instance; return $instance;
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) ); $instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
$title = strip_tags($instance['title']); $title = strip_tags($instance['title']);
@ -503,8 +571,11 @@ class WP_Widget_Text extends WP_Widget {
parent::__construct('text', __('Text'), $widget_ops, $control_ops); parent::__construct('text', __('Text'), $widget_ops, $control_ops);
} }
/**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) { public function widget( $args, $instance ) {
/** This filter is documented in wp-includes/default-widgets.php */ /** This filter is documented in wp-includes/default-widgets.php */
$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
@ -526,6 +597,11 @@ class WP_Widget_Text extends WP_Widget {
echo $args['after_widget']; echo $args['after_widget'];
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = $old_instance; $instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']); $instance['title'] = strip_tags($new_instance['title']);
@ -537,6 +613,9 @@ class WP_Widget_Text extends WP_Widget {
return $instance; return $instance;
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'text' => '' ) ); $instance = wp_parse_args( (array) $instance, array( 'title' => '', 'text' => '' ) );
$title = strip_tags($instance['title']); $title = strip_tags($instance['title']);
@ -564,8 +643,11 @@ class WP_Widget_Categories extends WP_Widget {
parent::__construct('categories', __('Categories'), $widget_ops); parent::__construct('categories', __('Categories'), $widget_ops);
} }
/**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) { public function widget( $args, $instance ) {
/** This filter is documented in wp-includes/default-widgets.php */ /** This filter is documented in wp-includes/default-widgets.php */
$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base ); $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base );
@ -644,6 +726,11 @@ class WP_Widget_Categories extends WP_Widget {
echo $args['after_widget']; echo $args['after_widget'];
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = $old_instance; $instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']); $instance['title'] = strip_tags($new_instance['title']);
@ -654,6 +741,9 @@ class WP_Widget_Categories extends WP_Widget {
return $instance; return $instance;
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
//Defaults //Defaults
$instance = wp_parse_args( (array) $instance, array( 'title' => '') ); $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
@ -695,7 +785,11 @@ class WP_Widget_Recent_Posts extends WP_Widget {
add_action( 'switch_theme', array($this, 'flush_widget_cache') ); add_action( 'switch_theme', array($this, 'flush_widget_cache') );
} }
public function widget($args, $instance) { /**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) {
$cache = array(); $cache = array();
if ( ! $this->is_preview() ) { if ( ! $this->is_preview() ) {
$cache = wp_cache_get( 'widget_recent_posts', 'widget' ); $cache = wp_cache_get( 'widget_recent_posts', 'widget' );
@ -773,6 +867,11 @@ class WP_Widget_Recent_Posts extends WP_Widget {
} }
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = $old_instance; $instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']); $instance['title'] = strip_tags($new_instance['title']);
@ -791,6 +890,9 @@ class WP_Widget_Recent_Posts extends WP_Widget {
wp_cache_delete('widget_recent_posts', 'widget'); wp_cache_delete('widget_recent_posts', 'widget');
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
$title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : ''; $title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5; $number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
@ -829,7 +931,6 @@ class WP_Widget_Recent_Comments extends WP_Widget {
} }
public function recent_comments_style() { public function recent_comments_style() {
/** /**
* Filter the Recent Comments default widget styles. * Filter the Recent Comments default widget styles.
* *
@ -850,6 +951,13 @@ class WP_Widget_Recent_Comments extends WP_Widget {
wp_cache_delete('widget_recent_comments', 'widget'); wp_cache_delete('widget_recent_comments', 'widget');
} }
/**
* @global array $comments
* @global object $comment
*
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) { public function widget( $args, $instance ) {
global $comments, $comment; global $comments, $comment;
@ -927,6 +1035,11 @@ class WP_Widget_Recent_Comments extends WP_Widget {
} }
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = $old_instance; $instance = $old_instance;
$instance['title'] = strip_tags($new_instance['title']); $instance['title'] = strip_tags($new_instance['title']);
@ -940,6 +1053,9 @@ class WP_Widget_Recent_Comments extends WP_Widget {
return $instance; return $instance;
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
$title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : ''; $title = isset( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5; $number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
@ -966,8 +1082,11 @@ class WP_Widget_RSS extends WP_Widget {
parent::__construct( 'rss', __('RSS'), $widget_ops, $control_ops ); parent::__construct( 'rss', __('RSS'), $widget_ops, $control_ops );
} }
public function widget($args, $instance) { /**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) {
if ( isset($instance['error']) && $instance['error'] ) if ( isset($instance['error']) && $instance['error'] )
return; return;
@ -1019,15 +1138,23 @@ class WP_Widget_RSS extends WP_Widget {
unset($rss); unset($rss);
} }
public function update($new_instance, $old_instance) { /**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) {
$testurl = ( isset( $new_instance['url'] ) && ( !isset( $old_instance['url'] ) || ( $new_instance['url'] != $old_instance['url'] ) ) ); $testurl = ( isset( $new_instance['url'] ) && ( !isset( $old_instance['url'] ) || ( $new_instance['url'] != $old_instance['url'] ) ) );
return wp_widget_rss_process( $new_instance, $testurl ); return wp_widget_rss_process( $new_instance, $testurl );
} }
public function form($instance) { /**
* @param array $instance
if ( empty($instance) ) */
public function form( $instance ) {
if ( empty( $instance ) ) {
$instance = array( 'title' => '', 'url' => '', 'items' => 10, 'error' => false, 'show_summary' => 0, 'show_author' => 0, 'show_date' => 0 ); $instance = array( 'title' => '', 'url' => '', 'items' => 10, 'error' => false, 'show_summary' => 0, 'show_author' => 0, 'show_date' => 0 );
}
$instance['number'] = $this->number; $instance['number'] = $this->number;
wp_widget_rss_form( $instance ); wp_widget_rss_form( $instance );
@ -1261,6 +1388,10 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops); parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops);
} }
/**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) { public function widget( $args, $instance ) {
$current_taxonomy = $this->_get_current_taxonomy($instance); $current_taxonomy = $this->_get_current_taxonomy($instance);
if ( !empty($instance['title']) ) { if ( !empty($instance['title']) ) {
@ -1301,6 +1432,11 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
echo $args['after_widget']; echo $args['after_widget'];
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = array(); $instance = array();
$instance['title'] = strip_tags(stripslashes($new_instance['title'])); $instance['title'] = strip_tags(stripslashes($new_instance['title']));
@ -1308,6 +1444,9 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
return $instance; return $instance;
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
$current_taxonomy = $this->_get_current_taxonomy($instance); $current_taxonomy = $this->_get_current_taxonomy($instance);
?> ?>
@ -1345,7 +1484,11 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops ); parent::__construct( 'nav_menu', __('Custom Menu'), $widget_ops );
} }
public function widget($args, $instance) { /**
* @param array $args
* @param array $instance
*/
public function widget( $args, $instance ) {
// Get menu // Get menu
$nav_menu = ! empty( $instance['nav_menu'] ) ? wp_get_nav_menu_object( $instance['nav_menu'] ) : false; $nav_menu = ! empty( $instance['nav_menu'] ) ? wp_get_nav_menu_object( $instance['nav_menu'] ) : false;
@ -1384,6 +1527,11 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
echo $args['after_widget']; echo $args['after_widget'];
} }
/**
* @param array $new_instance
* @param array $old_instance
* @return array
*/
public function update( $new_instance, $old_instance ) { public function update( $new_instance, $old_instance ) {
$instance = array(); $instance = array();
if ( ! empty( $new_instance['title'] ) ) { if ( ! empty( $new_instance['title'] ) ) {
@ -1395,6 +1543,9 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
return $instance; return $instance;
} }
/**
* @param array $instance
*/
public function form( $instance ) { public function form( $instance ) {
$title = isset( $instance['title'] ) ? $instance['title'] : ''; $title = isset( $instance['title'] ) ? $instance['title'] : '';
$nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : ''; $nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
@ -1475,5 +1626,3 @@ function wp_widgets_init() {
*/ */
do_action( 'widgets_init' ); do_action( 'widgets_init' );
} }
add_action('init', 'wp_widgets_init', 1);

161
wp-includes/formatting.php
View File

@ -21,13 +21,22 @@
* Code within certain html blocks are skipped. * Code within certain html blocks are skipped.
* *
* @since 0.71 * @since 0.71
* @uses $wp_cockneyreplace Array of formatted entities for certain common phrases *
* @global array $wp_cockneyreplace Array of formatted entities for certain common phrases
* @global array $shortcode_tags
* @staticvar array $static_characters
* @staticvar array $static_replacements
* @staticvar array $dynamic_characters
* @staticvar array $dynamic_replacements
* @staticvar array $default_no_texturize_tags
* @staticvar array $default_no_texturize_shortcodes
* @staticvar bool $run_texturize
* *
* @param string $text The text to be formatted * @param string $text The text to be formatted
* @param bool $reset Set to true for unit testing. Translated patterns will reset. * @param bool $reset Set to true for unit testing. Translated patterns will reset.
* @return string The string replaced with html entities * @return string The string replaced with html entities
*/ */
function wptexturize($text, $reset = false) { function wptexturize( $text, $reset = false ) {
global $wp_cockneyreplace, $shortcode_tags; global $wp_cockneyreplace, $shortcode_tags;
static $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements, static $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements,
$default_no_texturize_tags, $default_no_texturize_shortcodes, $run_texturize = true; $default_no_texturize_tags, $default_no_texturize_shortcodes, $run_texturize = true;
@ -297,9 +306,7 @@ function wptexturize($text, $reset = false) {
$text = implode( '', $textarr ); $text = implode( '', $textarr );
// Replace each & with &#038; unless it already looks like an entity. // Replace each & with &#038; unless it already looks like an entity.
$text = preg_replace('/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $text); return preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $text );
return $text;
} }
/** /**
@ -316,7 +323,7 @@ function wptexturize($text, $reset = false) {
* @param array $stack List of open tag elements. * @param array $stack List of open tag elements.
* @param array $disabled_elements The tag names to match against. Spaces are not allowed in tag names. * @param array $disabled_elements The tag names to match against. Spaces are not allowed in tag names.
*/ */
function _wptexturize_pushpop_element($text, &$stack, $disabled_elements) { function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
// Is it an opening tag or closing tag? // Is it an opening tag or closing tag?
if ( '/' !== $text[1] ) { if ( '/' !== $text[1] ) {
$opening_tag = true; $opening_tag = true;
@ -370,7 +377,7 @@ function _wptexturize_pushpop_element($text, &$stack, $disabled_elements) {
* after paragraphing. Default true. * after paragraphing. Default true.
* @return string Text which has been converted into correct paragraph tags. * @return string Text which has been converted into correct paragraph tags.
*/ */
function wpautop($pee, $br = true) { function wpautop( $pee, $br = true ) {
$pre_tags = array(); $pre_tags = array();
if ( trim($pee) === '' ) if ( trim($pee) === '' )
@ -519,7 +526,7 @@ function wpautop($pee, $br = true) {
* @return string * @return string
*/ */
function _autop_newline_preservation_helper( $matches ) { function _autop_newline_preservation_helper( $matches ) {
return str_replace("\n", "<WPPreserveNewline />", $matches[0]); return str_replace( "\n", "<WPPreserveNewline />", $matches[0] );
} }
/** /**
@ -529,6 +536,8 @@ function _autop_newline_preservation_helper( $matches ) {
* *
* @since 2.9.0 * @since 2.9.0
* *
* @global array $shortcode_tags
*
* @param string $pee The content. * @param string $pee The content.
* @return string The filtered content. * @return string The filtered content.
*/ */
@ -589,7 +598,7 @@ function shortcode_unautop( $pee ) {
* @param string $str The string to be checked * @param string $str The string to be checked
* @return bool True if $str fits a UTF-8 model, false otherwise. * @return bool True if $str fits a UTF-8 model, false otherwise.
*/ */
function seems_utf8($str) { function seems_utf8( $str ) {
mbstring_binary_safe_encoding(); mbstring_binary_safe_encoding();
$length = strlen($str); $length = strlen($str);
reset_mbstring_encoding(); reset_mbstring_encoding();
@ -621,10 +630,12 @@ function seems_utf8($str) {
* @since 1.2.2 * @since 1.2.2
* @access private * @access private
* *
* @staticvar string|false $_charset
*
* @param string $string The text which is to be encoded. * @param string $string The text which is to be encoded.
* @param int $quote_style Optional. Converts double quotes if set to ENT_COMPAT, both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. Also compatible with old values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES. * @param int $quote_style Optional. Converts double quotes if set to ENT_COMPAT, both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. Also compatible with old values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES.
* @param string $charset Optional. The character encoding of the string. Default is false. * @param string $charset Optional. The character encoding of the string. Default is false.
* @param boolean $double_encode Optional. Whether to encode existing html entities. Default is false. * @param bool $double_encode Optional. Whether to encode existing html entities. Default is false.
* @return string The encoded text with HTML entities. * @return string The encoded text with HTML entities.
*/ */
function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) { function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
@ -702,7 +713,13 @@ function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = fals
* @since 2.8.0 * @since 2.8.0
* *
* @param string $string The text which is to be decoded. * @param string $string The text which is to be decoded.
* @param mixed $quote_style Optional. Converts double quotes if set to ENT_COMPAT, both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. Also compatible with old _wp_specialchars() values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES. * @param string|int $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
* both single and double if set to ENT_QUOTES or
* none if set to ENT_NOQUOTES.
* Also compatible with old _wp_specialchars() values;
* converting single quotes if set to 'single',
* double if set to 'double' or both if otherwise set.
* Default is ENT_NOQUOTES.
* @return string The decoded text without HTML entities. * @return string The decoded text without HTML entities.
*/ */
function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) { function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
@ -758,8 +775,11 @@ function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
* *
* @since 2.8.0 * @since 2.8.0
* *
* @staticvar bool $is_utf8
* @staticvar bool $utf8_pcre
*
* @param string $string The text which is to be checked. * @param string $string The text which is to be checked.
* @param boolean $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false. * @param bool $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false.
* @return string The checked text. * @return string The checked text.
*/ */
function wp_check_invalid_utf8( $string, $strip = false ) { function wp_check_invalid_utf8( $string, $strip = false ) {
@ -870,7 +890,7 @@ function utf8_uri_encode( $utf8_string, $length = 0 ) {
* @param string $string Text that might have accent characters * @param string $string Text that might have accent characters
* @return string Filtered string with replaced "nice" characters. * @return string Filtered string with replaced "nice" characters.
*/ */
function remove_accents($string) { function remove_accents( $string ) {
if ( !preg_match('/[\x80-\xff]/', $string) ) if ( !preg_match('/[\x80-\xff]/', $string) )
return $string; return $string;
@ -1372,7 +1392,7 @@ function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'displa
* @since 2.5.1 * @since 2.5.1
* *
* @param string $orderby Order by clause to be validated. * @param string $orderby Order by clause to be validated.
* @return string|bool Returns $orderby if valid, false otherwise. * @return string|false Returns $orderby if valid, false otherwise.
*/ */
function sanitize_sql_orderby( $orderby ) { function sanitize_sql_orderby( $orderby ) {
if ( preg_match( '/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby ) || preg_match( '/^\s*RAND\(\s*\)\s*$/i', $orderby ) ) { if ( preg_match( '/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby ) || preg_match( '/^\s*RAND\(\s*\)\s*$/i', $orderby ) ) {
@ -1431,7 +1451,7 @@ function sanitize_html_class( $class, $fallback = '' ) {
* @param string $deprecated Not used. * @param string $deprecated Not used.
* @return string Converted string. * @return string Converted string.
*/ */
function convert_chars($content, $deprecated = '') { function convert_chars( $content, $deprecated = '' ) {
if ( !empty( $deprecated ) ) if ( !empty( $deprecated ) )
_deprecated_argument( __FUNCTION__, '0.71' ); _deprecated_argument( __FUNCTION__, '0.71' );
@ -1676,12 +1696,12 @@ function format_to_edit( $content, $richedit = false ) {
* *
* @since 0.71 * @since 0.71
* *
* @param mixed $number Number to append zeros to if not greater than threshold. * @param int $number Number to append zeros to if not greater than threshold.
* @param int $threshold Digit places number needs to be to not have zeros added. * @param int $threshold Digit places number needs to be to not have zeros added.
* @return string Adds leading zeros to number if needed. * @return string Adds leading zeros to number if needed.
*/ */
function zeroise($number, $threshold) { function zeroise( $number, $threshold ) {
return sprintf('%0'.$threshold.'s', $number); return sprintf( '%0' . $threshold . 's', $number );
} }
/** /**
@ -1692,7 +1712,7 @@ function zeroise($number, $threshold) {
* @param string $string Value to which backslashes will be added. * @param string $string Value to which backslashes will be added.
* @return string String with backslashes inserted. * @return string String with backslashes inserted.
*/ */
function backslashit($string) { function backslashit( $string ) {
if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' ) if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
$string = '\\\\' . $string; $string = '\\\\' . $string;
return addcslashes( $string, 'A..Za..z' ); return addcslashes( $string, 'A..Za..z' );
@ -1760,7 +1780,7 @@ function addslashes_gpc($gpc) {
* @param mixed $value The value to be stripped. * @param mixed $value The value to be stripped.
* @return mixed Stripped value. * @return mixed Stripped value.
*/ */
function stripslashes_deep($value) { function stripslashes_deep( $value ) {
if ( is_array($value) ) { if ( is_array($value) ) {
$value = array_map('stripslashes_deep', $value); $value = array_map('stripslashes_deep', $value);
} elseif ( is_object($value) ) { } elseif ( is_object($value) ) {
@ -1784,9 +1804,8 @@ function stripslashes_deep($value) {
* @param array|string $value The array or string to be encoded. * @param array|string $value The array or string to be encoded.
* @return array|string $value The encoded array (or string from the callback). * @return array|string $value The encoded array (or string from the callback).
*/ */
function urlencode_deep($value) { function urlencode_deep( $value ) {
$value = is_array($value) ? array_map('urlencode_deep', $value) : urlencode($value); return is_array( $value ) ? array_map( 'urlencode_deep', $value ) : urlencode( $value );
return $value;
} }
/** /**
@ -1823,9 +1842,7 @@ function antispambot( $email_address, $hex_encoding = 0 ) {
} }
} }
$email_no_spam_address = str_replace( '@', '&#64;', $email_no_spam_address ); return str_replace( '@', '&#64;', $email_no_spam_address );
return $email_no_spam_address;
} }
/** /**
@ -1840,7 +1857,7 @@ function antispambot( $email_address, $hex_encoding = 0 ) {
* @param array $matches Single Regex Match. * @param array $matches Single Regex Match.
* @return string HTML A element with URI address. * @return string HTML A element with URI address.
*/ */
function _make_url_clickable_cb($matches) { function _make_url_clickable_cb( $matches ) {
$url = $matches[2]; $url = $matches[2];
if ( ')' == $matches[3] && strpos( $url, '(' ) ) { if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
@ -1877,7 +1894,7 @@ function _make_url_clickable_cb($matches) {
* @param array $matches Single Regex Match. * @param array $matches Single Regex Match.
* @return string HTML A element with URL address. * @return string HTML A element with URL address.
*/ */
function _make_web_ftp_clickable_cb($matches) { function _make_web_ftp_clickable_cb( $matches ) {
$ret = ''; $ret = '';
$dest = $matches[2]; $dest = $matches[2];
$dest = 'http://' . $dest; $dest = 'http://' . $dest;
@ -1905,7 +1922,7 @@ function _make_web_ftp_clickable_cb($matches) {
* @param array $matches Single Regex Match. * @param array $matches Single Regex Match.
* @return string HTML A element with email address. * @return string HTML A element with email address.
*/ */
function _make_email_clickable_cb($matches) { function _make_email_clickable_cb( $matches ) {
$email = $matches[2] . '@' . $matches[3]; $email = $matches[2] . '@' . $matches[3];
return $matches[1] . "<a href=\"mailto:$email\">$email</a>"; return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
} }
@ -1976,8 +1993,7 @@ function make_clickable( $text ) {
} }
// Cleanup of accidental links within links // Cleanup of accidental links within links
$r = preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r ); return preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
return $r;
} }
/** /**
@ -2048,8 +2064,7 @@ function wp_rel_nofollow( $text ) {
// This is a pre save filter, so text is already escaped. // This is a pre save filter, so text is already escaped.
$text = stripslashes($text); $text = stripslashes($text);
$text = preg_replace_callback('|<a (.+?)>|i', 'wp_rel_nofollow_callback', $text); $text = preg_replace_callback('|<a (.+?)>|i', 'wp_rel_nofollow_callback', $text);
$text = wp_slash($text); return wp_slash( $text );
return $text;
} }
/** /**
@ -2076,9 +2091,10 @@ function wp_rel_nofollow_callback( $matches ) {
* Looks up one smiley code in the $wpsmiliestrans global array and returns an * Looks up one smiley code in the $wpsmiliestrans global array and returns an
* `<img>` string for that smiley. * `<img>` string for that smiley.
* *
* @global array $wpsmiliestrans
* @since 2.8.0 * @since 2.8.0
* *
* @global array $wpsmiliestrans
*
* @param array $matches Single match. Smiley code to convert to image. * @param array $matches Single match. Smiley code to convert to image.
* @return string Image string for smiley. * @return string Image string for smiley.
*/ */
@ -2121,7 +2137,8 @@ function translate_smiley( $matches ) {
* used in the function isn't empty. * used in the function isn't empty.
* *
* @since 0.71 * @since 0.71
* @uses $wp_smiliessearch *
* @global string|array $wp_smiliessearch
* *
* @param string $text Content to convert smilies from text. * @param string $text Content to convert smilies from text.
* @return string Converted content with text smilies replaced with images. * @return string Converted content with text smilies replaced with images.
@ -2173,7 +2190,7 @@ function convert_smilies( $text ) {
* @since 0.71 * @since 0.71
* *
* @param string $email Email address to verify. * @param string $email Email address to verify.
* @param boolean $deprecated Deprecated. * @param bool $deprecated Deprecated.
* @return string|bool Either false or the valid email address. * @return string|bool Either false or the valid email address.
*/ */
function is_email( $email, $deprecated = false ) { function is_email( $email, $deprecated = false ) {
@ -2265,14 +2282,13 @@ function is_email( $email, $deprecated = false ) {
* @param string $string Subject line * @param string $string Subject line
* @return string Converted string to ASCII * @return string Converted string to ASCII
*/ */
function wp_iso_descrambler($string) { function wp_iso_descrambler( $string ) {
/* this may only work with iso-8859-1, I'm afraid */ /* this may only work with iso-8859-1, I'm afraid */
if (!preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) { if (!preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
return $string; return $string;
} else { } else {
$subject = str_replace('_', ' ', $matches[2]); $subject = str_replace('_', ' ', $matches[2]);
$subject = preg_replace_callback('#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject); return preg_replace_callback( '#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject );
return $subject;
} }
} }
@ -2359,7 +2375,7 @@ function get_date_from_gmt( $string, $format = 'Y-m-d H:i:s' ) {
* @param string $timezone Either 'Z' for 0 offset or '±hhmm'. * @param string $timezone Either 'Z' for 0 offset or '±hhmm'.
* @return int|float The offset in seconds. * @return int|float The offset in seconds.
*/ */
function iso8601_timezone_to_offset($timezone) { function iso8601_timezone_to_offset( $timezone ) {
// $timezone is either 'Z' or '[+|-]hhmm' // $timezone is either 'Z' or '[+|-]hhmm'
if ($timezone == 'Z') { if ($timezone == 'Z') {
$offset = 0; $offset = 0;
@ -2381,7 +2397,7 @@ function iso8601_timezone_to_offset($timezone) {
* @param string $timezone Optional. If set to GMT returns the time minus gmt_offset. Default is 'user'. * @param string $timezone Optional. If set to GMT returns the time minus gmt_offset. Default is 'user'.
* @return string The date and time in MySQL DateTime format - Y-m-d H:i:s. * @return string The date and time in MySQL DateTime format - Y-m-d H:i:s.
*/ */
function iso8601_to_datetime($date_string, $timezone = 'user') { function iso8601_to_datetime( $date_string, $timezone = 'user' ) {
$timezone = strtolower($timezone); $timezone = strtolower($timezone);
if ($timezone == 'gmt') { if ($timezone == 'gmt') {
@ -2416,7 +2432,7 @@ function iso8601_to_datetime($date_string, $timezone = 'user') {
* @param string $text Content to replace links to open in a new window. * @param string $text Content to replace links to open in a new window.
* @return string Content that has filtered links. * @return string Content that has filtered links.
*/ */
function popuplinks($text) { function popuplinks( $text ) {
$text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text); $text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
return $text; return $text;
} }
@ -2603,7 +2619,7 @@ function human_time_diff( $from, $to = '' ) {
* @param string $text Optional. The excerpt. If set to empty, an excerpt is generated. * @param string $text Optional. The excerpt. If set to empty, an excerpt is generated.
* @return string The excerpt. * @return string The excerpt.
*/ */
function wp_trim_excerpt($text = '') { function wp_trim_excerpt( $text = '' ) {
$raw_excerpt = $text; $raw_excerpt = $text;
if ( '' == $text ) { if ( '' == $text ) {
$text = get_the_content(''); $text = get_the_content('');
@ -2701,7 +2717,7 @@ function wp_trim_words( $text, $num_words = 55, $more = null ) {
* @param string $text The text within which entities will be converted. * @param string $text The text within which entities will be converted.
* @return string Text with converted entities. * @return string Text with converted entities.
*/ */
function ent2ncr($text) { function ent2ncr( $text ) {
/** /**
* Filter text before named entities are converted into numbered entities. * Filter text before named entities are converted into numbered entities.
@ -2990,7 +3006,7 @@ function ent2ncr($text) {
* @param string $text The text to be formatted. * @param string $text The text to be formatted.
* @return string The formatted text after filter is applied. * @return string The formatted text after filter is applied.
*/ */
function wp_richedit_pre($text) { function wp_richedit_pre( $text ) {
if ( empty( $text ) ) { if ( empty( $text ) ) {
/** /**
* Filter text returned for the rich text editor. * Filter text returned for the rich text editor.
@ -3028,7 +3044,7 @@ function wp_richedit_pre($text) {
* @param string $output The text to be formatted. * @param string $output The text to be formatted.
* @return string Formatted text after filter applied. * @return string Formatted text after filter applied.
*/ */
function wp_htmledit_pre($output) { function wp_htmledit_pre( $output ) {
if ( !empty($output) ) if ( !empty($output) )
$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > & $output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
@ -3052,7 +3068,8 @@ function wp_htmledit_pre($output) {
* @since 2.8.1 * @since 2.8.1
* @access private * @access private
* *
* @param string|array $search The value being searched for, otherwise known as the needle. An array may be used to designate multiple needles. * @param string|array $search The value being searched for, otherwise known as the needle.
* An array may be used to designate multiple needles.
* @param string $subject The string being searched and replaced on, otherwise known as the haystack. * @param string $subject The string being searched and replaced on, otherwise known as the haystack.
* @return string The string with the replaced svalues. * @return string The string with the replaced svalues.
*/ */
@ -3075,6 +3092,9 @@ function _deep_replace( $search, $subject ) {
* is preparing an array for use in an IN clause. * is preparing an array for use in an IN clause.
* *
* @since 2.8.0 * @since 2.8.0
*
* @global wpdb $wpdb
*
* @param string|array $data Unescaped data * @param string|array $data Unescaped data
* @return string|array Escaped data * @return string|array Escaped data
*/ */
@ -3094,7 +3114,9 @@ function esc_sql( $data ) {
* *
* @param string $url The URL to be cleaned. * @param string $url The URL to be cleaned.
* @param array $protocols Optional. An array of acceptable protocols. * @param array $protocols Optional. An array of acceptable protocols.
* Defaults to 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn' if not set. * Defaults to 'http', 'https', 'ftp', 'ftps', 'mailto',
* 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms',
* 'rtsp', 'svn' if not set.
* @param string $_context Private. Use esc_url_raw() for database usage. * @param string $_context Private. Use esc_url_raw() for database usage.
* @return string The cleaned $url after the 'clean_url' filter is applied. * @return string The cleaned $url after the 'clean_url' filter is applied.
*/ */
@ -3167,7 +3189,7 @@ function esc_url_raw( $url, $protocols = null ) {
* @param string $myHTML The text to be converted. * @param string $myHTML The text to be converted.
* @return string Converted text. * @return string Converted text.
*/ */
function htmlentities2($myHTML) { function htmlentities2( $myHTML ) {
$translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES ); $translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES );
$translation_table[chr(38)] = '&'; $translation_table[chr(38)] = '&';
return preg_replace( "/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table) ); return preg_replace( "/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table) );
@ -3284,7 +3306,7 @@ function esc_textarea( $text ) {
* @param string $tag_name * @param string $tag_name
* @return string * @return string
*/ */
function tag_escape($tag_name) { function tag_escape( $tag_name ) {
$safe_tag = strtolower( preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name) ); $safe_tag = strtolower( preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name) );
/** /**
* Filter a string cleaned and escaped for output as an HTML tag. * Filter a string cleaned and escaped for output as an HTML tag.
@ -3321,11 +3343,13 @@ function wp_make_link_relative( $link ) {
* *
* @since 2.0.5 * @since 2.0.5
* *
* @global wpdb $wpdb
*
* @param string $option The name of the option. * @param string $option The name of the option.
* @param string $value The unsanitised value. * @param string $value The unsanitised value.
* @return string Sanitized value. * @return string Sanitized value.
*/ */
function sanitize_option($option, $value) { function sanitize_option( $option, $value ) {
global $wpdb; global $wpdb;
$original_value = $value; $original_value = $value;
@ -3523,9 +3547,7 @@ function sanitize_option($option, $value) {
* @param string $option The option name. * @param string $option The option name.
* @param string $original_value The original value passed to the function. * @param string $original_value The original value passed to the function.
*/ */
$value = apply_filters( "sanitize_option_{$option}", $value, $option, $original_value ); return apply_filters( "sanitize_option_{$option}", $value, $option, $original_value );
return $value;
} }
/** /**
@ -3665,7 +3687,7 @@ function wp_sprintf( $pattern ) {
* @param array $args List items to prepend to the content and replace '%l'. * @param array $args List items to prepend to the content and replace '%l'.
* @return string Localized list items and rest of the content. * @return string Localized list items and rest of the content.
*/ */
function wp_sprintf_l($pattern, $args) { function wp_sprintf_l( $pattern, $args ) {
// Not a match // Not a match
if ( substr($pattern, 0, 2) != '%l' ) if ( substr($pattern, 0, 2) != '%l' )
return $pattern; return $pattern;
@ -3721,7 +3743,7 @@ function wp_sprintf_l($pattern, $args) {
* @since 2.5.0 * @since 2.5.0
* *
* @param string $str String to get the excerpt from. * @param string $str String to get the excerpt from.
* @param integer $count Maximum number of characters to take. * @param int $count Maximum number of characters to take.
* @param string $more Optional. What to append if $str needs to be trimmed. Defaults to empty string. * @param string $more Optional. What to append if $str needs to be trimmed. Defaults to empty string.
* @return string The excerpt. * @return string The excerpt.
*/ */
@ -3745,6 +3767,8 @@ function wp_html_excerpt( $str, $count, $more = null ) {
* *
* @since 2.7.0 * @since 2.7.0
* *
* @global string $_links_add_base
*
* @param string $content String to search for links in. * @param string $content String to search for links in.
* @param string $base The base URL to prefix to links. * @param string $base The base URL to prefix to links.
* @param array $attrs The attributes which should be processed. * @param array $attrs The attributes which should be processed.
@ -3763,10 +3787,12 @@ function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
* @since 2.7.0 * @since 2.7.0
* @access private * @access private
* *
* @global string $_links_add_base
*
* @param string $m The matched link. * @param string $m The matched link.
* @return string The processed link. * @return string The processed link.
*/ */
function _links_add_base($m) { function _links_add_base( $m ) {
global $_links_add_base; global $_links_add_base;
//1 = attribute name 2 = quotation mark 3 = URL //1 = attribute name 2 = quotation mark 3 = URL
return $m[1] . '=' . $m[2] . return $m[1] . '=' . $m[2] .
@ -3787,6 +3813,8 @@ function _links_add_base($m) {
* *
* @since 2.7.0 * @since 2.7.0
* *
* @global string $_links_add_target
*
* @param string $content String to search for links in. * @param string $content String to search for links in.
* @param string $target The Target to add to the links. * @param string $target The Target to add to the links.
* @param array $tags An array of tags to apply to. * @param array $tags An array of tags to apply to.
@ -3805,6 +3833,8 @@ function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
* @since 2.7.0 * @since 2.7.0
* @access private * @access private
* *
* @global string $_links_add_target
*
* @param string $m The matched link. * @param string $m The matched link.
* @return string The processed link. * @return string The processed link.
*/ */
@ -3840,7 +3870,7 @@ function normalize_whitespace( $str ) {
* @since 2.9.0 * @since 2.9.0
* *
* @param string $string String containing HTML tags * @param string $string String containing HTML tags
* @param bool $remove_breaks optional Whether to remove left over line breaks and white space chars * @param bool $remove_breaks Optional. Whether to remove left over line breaks and white space chars
* @return string The processed string. * @return string The processed string.
*/ */
function wp_strip_all_tags($string, $remove_breaks = false) { function wp_strip_all_tags($string, $remove_breaks = false) {
@ -3867,7 +3897,7 @@ function wp_strip_all_tags($string, $remove_breaks = false) {
* @param string $str * @param string $str
* @return string * @return string
*/ */
function sanitize_text_field($str) { function sanitize_text_field( $str ) {
$filtered = wp_check_invalid_utf8( $str ); $filtered = wp_check_invalid_utf8( $str );
if ( strpos($filtered, '<') !== false ) { if ( strpos($filtered, '<') !== false ) {
@ -3919,6 +3949,8 @@ function wp_basename( $path, $suffix = '' ) {
* Violating our coding standards for a good function name. * Violating our coding standards for a good function name.
* *
* @since 3.0.0 * @since 3.0.0
*
* @staticvar string|false $dblq
*/ */
function capital_P_dangit( $text ) { function capital_P_dangit( $text ) {
// Simple replacement for titles // Simple replacement for titles
@ -4035,7 +4067,7 @@ function wp_unslash( $value ) {
* @since 3.6.0 * @since 3.6.0
* *
* @param string $content A string which might contain a URL. * @param string $content A string which might contain a URL.
* @return string The found URL. * @return string|false The found URL.
*/ */
function get_url_in_content( $content ) { function get_url_in_content( $content ) {
if ( empty( $content ) ) { if ( empty( $content ) ) {
@ -4058,6 +4090,8 @@ function get_url_in_content( $content ) {
* *
* @since 4.0.0 * @since 4.0.0
* *
* @staticvar string $spaces
*
* @return string The spaces regexp. * @return string The spaces regexp.
*/ */
function wp_spaces_regexp() { function wp_spaces_regexp() {
@ -4086,6 +4120,8 @@ function wp_spaces_regexp() {
* Print the important emoji-related styles. * Print the important emoji-related styles.
* *
* @since 4.2.0 * @since 4.2.0
*
* @staticvar bool $printed
*/ */
function print_emoji_styles() { function print_emoji_styles() {
static $printed = false; static $printed = false;
@ -4113,6 +4149,11 @@ img.emoji {
<?php <?php
} }
/**
*
* @global string $wp_version
* @staticvar bool $printed
*/
function print_emoji_detection_script() { function print_emoji_detection_script() {
global $wp_version; global $wp_version;
static $printed = false; static $printed = false;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32568'; $wp_version = '4.3-alpha-32591';
/** /**
* 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.