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

After [35718], update the location of some files in `This filter is documented in` docs. 

Partially reverts [33954].

Fixes #33413.
Built from https://develop.svn.wordpress.org/trunk@35725


git-svn-id: http://core.svn.wordpress.org/trunk@35689 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-11-22 03:51:28 +00:00
parent 5dae1386aa
commit bc1e479fd0
12 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/template.php
View File

@ -1948,7 +1948,7 @@ function _wp_admin_html_begin() {
<![endif]-->
<!--[if !(IE 8) ]><!-->
<html xmlns="http://www.w3.org/1999/xhtml" class="<?php echo $admin_html_class; ?>" <?php
/** This action is documented in wp-admin/includes/template-functions.php */
/** This action is documented in wp-admin/includes/template.php */
do_action( 'admin_xml_ns' );
?> <?php language_attributes(); ?>>
<!--<![endif]-->

2
wp-admin/includes/user.php
View File

@ -142,7 +142,7 @@ function edit_user( $user_id = 0 ) {
if ( !$update && username_exists( $user->user_login ) )
$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
/** This filter is documented in wp-includes/user-functions.php */
/** This filter is documented in wp-includes/user.php */
$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ) ) ) {

6
wp-includes/bookmark.php
View File

@ -378,7 +378,7 @@ function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
return $value;
if ( 'edit' == $context ) {
/** This filter is documented in wp-includes/post-functions.php */
/** This filter is documented in wp-includes/post.php */
$value = apply_filters( "edit_$field", $value, $bookmark_id );
if ( 'link_notes' == $field ) {
@ -387,10 +387,10 @@ function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
$value = esc_attr($value);
}
} elseif ( 'db' == $context ) {
/** This filter is documented in wp-includes/post-functions.php */
/** This filter is documented in wp-includes/post.php */
$value = apply_filters( "pre_$field", $value );
} else {
/** This filter is documented in wp-includes/post-functions.php */
/** This filter is documented in wp-includes/post.php */
$value = apply_filters( $field, $value, $bookmark_id, $context );
if ( 'attribute' == $context ) {

16
wp-includes/comment.php
View File

@ -1118,7 +1118,7 @@ function wp_delete_comment($comment_id, $force_delete = false) {
clean_comment_cache( $comment->comment_ID );
/** This action is documented in wp-includes/comment-functions.php */
/** This action is documented in wp-includes/comment.php */
do_action( 'wp_set_comment_status', $comment->comment_ID, 'delete' );
wp_transition_comment_status('delete', $comment->comment_approved, $comment);
@ -1566,7 +1566,7 @@ function wp_filter_comment($commentdata) {
*/
$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_ID'] );
} elseif ( isset( $commentdata['user_id'] ) ) {
/** This filter is documented in wp-includes/comment-functions.php */
/** This filter is documented in wp-includes/comment.php */
$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_id'] );
}
@ -1578,7 +1578,7 @@ function wp_filter_comment($commentdata) {
* @param int $comment_agent The comment author's browser user agent.
*/
$commentdata['comment_agent'] = apply_filters( 'pre_comment_user_agent', ( isset( $commentdata['comment_agent'] ) ? $commentdata['comment_agent'] : '' ) );
/** This filter is documented in wp-includes/comment-functions.php */
/** This filter is documented in wp-includes/comment.php */
$commentdata['comment_author'] = apply_filters( 'pre_comment_author_name', $commentdata['comment_author'] );
/**
* Filter the comment content before it is set.
@ -1596,9 +1596,9 @@ function wp_filter_comment($commentdata) {
* @param int $comment_author_ip The comment author's IP.
*/
$commentdata['comment_author_IP'] = apply_filters( 'pre_comment_user_ip', $commentdata['comment_author_IP'] );
/** This filter is documented in wp-includes/comment-functions.php */
/** This filter is documented in wp-includes/comment.php */
$commentdata['comment_author_url'] = apply_filters( 'pre_comment_author_url', $commentdata['comment_author_url'] );
/** This filter is documented in wp-includes/comment-functions.php */
/** This filter is documented in wp-includes/comment.php */
$commentdata['comment_author_email'] = apply_filters( 'pre_comment_author_email', $commentdata['comment_author_email'] );
$commentdata['filtered'] = true;
return $commentdata;
@ -1759,7 +1759,7 @@ function wp_new_comment_notify_moderator( $comment_ID ) {
// Only send notifications for pending comments.
$maybe_notify = ( '0' == $comment->comment_approved );
/** This filter is documented in wp-includes/comment-functions.php */
/** This filter is documented in wp-includes/comment.php */
$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_ID );
if ( ! $maybe_notify ) {
@ -2069,7 +2069,7 @@ function wp_update_comment_count_now($post_id) {
* @param int $old The old comment count.
*/
do_action( 'wp_update_comment_count', $post_id, $new, $old );
/** This action is documented in wp-includes/post-functions.php */
/** This action is documented in wp-includes/post.php */
do_action( 'edit_post', $post_id, $post );
return true;
@ -2586,7 +2586,7 @@ function _close_comments_for_old_post( $open, $post_id ) {
$post = get_post($post_id);
/** This filter is documented in wp-includes/comment-functions.php */
/** This filter is documented in wp-includes/comment.php */
$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
if ( ! in_array( $post->post_type, $post_types ) )
return $open;

2
wp-includes/media.php
View File

@ -755,7 +755,7 @@ function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon
$src = false;
if ( $icon && $src = wp_mime_type_icon( $attachment_id ) ) {
/** This filter is documented in wp-includes/post-functions.php */
/** This filter is documented in wp-includes/post.php */
$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
$src_file = $icon_dir . '/' . wp_basename( $src );

14
wp-includes/meta.php
View File

@ -532,7 +532,7 @@ function metadata_exists( $meta_type, $object_id, $meta_key ) {
return false;
}
/** This filter is documented in wp-includes/meta-functions.php */
/** This filter is documented in wp-includes/meta.php */
$check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, true );
if ( null !== $check )
return (bool) $check;
@ -653,11 +653,11 @@ function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key =
$where = array();
$where[$id_column] = $meta_id;
/** This action is documented in wp-includes/meta-functions.php */
/** This action is documented in wp-includes/meta.php */
do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
if ( 'post' == $meta_type ) {
/** This action is documented in wp-includes/meta-functions.php */
/** This action is documented in wp-includes/meta.php */
do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
}
@ -669,11 +669,11 @@ function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key =
// Clear the caches.
wp_cache_delete($object_id, $meta_type . '_meta');
/** This action is documented in wp-includes/meta-functions.php */
/** This action is documented in wp-includes/meta.php */
do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
if ( 'post' == $meta_type ) {
/** This action is documented in wp-includes/meta-functions.php */
/** This action is documented in wp-includes/meta.php */
do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
}
@ -721,7 +721,7 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) {
if ( $meta = get_metadata_by_mid( $meta_type, $meta_id ) ) {
$object_id = $meta->{$column};
/** This action is documented in wp-includes/meta-functions.php */
/** This action is documented in wp-includes/meta.php */
do_action( "delete_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value );
// Old-style action.
@ -745,7 +745,7 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) {
// Clear the caches.
wp_cache_delete($object_id, $meta_type . '_meta');
/** This action is documented in wp-includes/meta-functions.php */
/** This action is documented in wp-includes/meta.php */
do_action( "deleted_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value );
// Old-style action.

2
wp-includes/ms-functions.php
View File

@ -431,7 +431,7 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) );
}
/** This filter is documented in wp-includes/user-functions.php */
/** This filter is documented in wp-includes/user.php */
$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
if ( in_array( strtolower( $user_name ), array_map( 'strtolower', $illegal_logins ) ) ) {

18
wp-includes/post.php
View File

@ -2129,7 +2129,7 @@ function wp_count_posts( $type = 'post', $perm = '' ) {
$counts = wp_cache_get( $cache_key, 'counts' );
if ( false !== $counts ) {
/** This filter is documented in wp-includes/post-functions.php */
/** This filter is documented in wp-includes/post.php */
return apply_filters( 'wp_count_posts', $counts, $type, $perm );
}
@ -3484,16 +3484,16 @@ function wp_publish_post( $post ) {
$post->post_status = 'publish';
wp_transition_post_status( 'publish', $old_status, $post );
/** This action is documented in wp-includes/post-functions.php */
/** This action is documented in wp-includes/post.php */
do_action( 'edit_post', $post->ID, $post );
/** This action is documented in wp-includes/post-functions.php */
/** This action is documented in wp-includes/post.php */
do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
/** This action is documented in wp-includes/post-functions.php */
/** This action is documented in wp-includes/post.php */
do_action( 'save_post', $post->ID, $post, true );
/** This action is documented in wp-includes/post-functions.php */
/** This action is documented in wp-includes/post.php */
do_action( 'wp_insert_post', $post->ID, $post, true );
}
@ -4403,7 +4403,7 @@ function get_pages( $args = array() ) {
if ( $cache = wp_cache_get( $cache_key, 'posts' ) ) {
// Convert to WP_Post instances.
$pages = array_map( 'get_post', $cache );
/** This filter is documented in wp-includes/post-functions.php */
/** This filter is documented in wp-includes/post.php */
$pages = apply_filters( 'get_pages', $pages, $r );
return $pages;
}
@ -4545,7 +4545,7 @@ function get_pages( $args = array() ) {
$pages = $wpdb->get_results($query);
if ( empty($pages) ) {
/** This filter is documented in wp-includes/post-functions.php */
/** This filter is documented in wp-includes/post.php */
$pages = apply_filters( 'get_pages', array(), $r );
return $pages;
}
@ -4735,13 +4735,13 @@ function wp_delete_attachment( $post_id, $force_delete = false ) {
foreach ( $post_meta_ids as $mid )
delete_metadata_by_mid( 'post', $mid );
/** This action is documented in wp-includes/post-functions.php */
/** This action is documented in wp-includes/post.php */
do_action( 'delete_post', $post_id );
$result = $wpdb->delete( $wpdb->posts, array( 'ID' => $post_id ) );
if ( ! $result ) {
return false;
}
/** This action is documented in wp-includes/post-functions.php */
/** This action is documented in wp-includes/post.php */
do_action( 'deleted_post', $post_id );
$uploadpath = wp_upload_dir();

20
wp-includes/taxonomy.php
View File

@ -1474,7 +1474,7 @@ function get_terms( $taxonomies, $args = '' ) {
if ( empty($terms) ) {
wp_cache_add( $cache_key, array(), 'terms', DAY_IN_SECONDS );
/** This filter is documented in wp-includes/taxonomy-functions.php */
/** This filter is documented in wp-includes/taxonomy.php */
return apply_filters( 'get_terms', array(), $taxonomies, $args );
}
@ -1551,7 +1551,7 @@ function get_terms( $taxonomies, $args = '' ) {
$terms = array_map( 'get_term', $terms );
}
/** This filter is documented in wp-includes/taxonomy-functions.php */
/** This filter is documented in wp-includes/taxonomy.php */
return apply_filters( 'get_terms', $terms, $taxonomies, $args );
}
@ -2660,11 +2660,11 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
if ( empty($slug) ) {
$slug = sanitize_title($slug, $term_id);
/** This action is documented in wp-includes/taxonomy-functions.php */
/** This action is documented in wp-includes/taxonomy.php */
do_action( 'edit_terms', $term_id, $taxonomy );
$wpdb->update( $wpdb->terms, compact( 'slug' ), compact( 'term_id' ) );
/** This action is documented in wp-includes/taxonomy-functions.php */
/** This action is documented in wp-includes/taxonomy.php */
do_action( 'edited_terms', $term_id, $taxonomy );
}
@ -3304,7 +3304,7 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
*/
do_action( "edit_$taxonomy", $term_id, $tt_id );
/** This filter is documented in wp-includes/taxonomy-functions.php */
/** This filter is documented in wp-includes/taxonomy.php */
$term_id = apply_filters( 'term_id_filter', $term_id, $tt_id );
clean_term_cache($term_id, $taxonomy);
@ -3862,11 +3862,11 @@ function _update_post_term_count( $terms, $taxonomy ) {
if ( $object_types )
$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
/** This action is documented in wp-includes/taxonomy-functions.php */
/** This action is documented in wp-includes/taxonomy.php */
do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
$wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
/** This action is documented in wp-includes/taxonomy-functions.php */
/** This action is documented in wp-includes/taxonomy.php */
do_action( 'edited_term_taxonomy', $term, $taxonomy->name );
}
}
@ -3889,11 +3889,11 @@ function _update_generic_term_count( $terms, $taxonomy ) {
foreach ( (array) $terms as $term ) {
$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term ) );
/** This action is documented in wp-includes/taxonomy-functions.php */
/** This action is documented in wp-includes/taxonomy.php */
do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
$wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
/** This action is documented in wp-includes/taxonomy-functions.php */
/** This action is documented in wp-includes/taxonomy.php */
do_action( 'edited_term_taxonomy', $term, $taxonomy->name );
}
}
@ -4599,7 +4599,7 @@ function get_ancestors( $object_id = 0, $object_type = '', $resource_type = '' )
if ( empty( $object_id ) ) {
/** This filter is documented in wp-includes/taxonomy-functions.php */
/** This filter is documented in wp-includes/taxonomy.php */
return apply_filters( 'get_ancestors', $ancestors, $object_id, $object_type, $resource_type );
}

6
wp-includes/user.php
View File

@ -1034,7 +1034,7 @@ function sanitize_user_field($field, $value, $user_id, $context) {
if ( 'edit' == $context ) {
if ( $prefixed ) {
/** This filter is documented in wp-includes/post-functions.php */
/** This filter is documented in wp-includes/post.php */
$value = apply_filters( "edit_{$field}", $value, $user_id );
} else {
@ -1058,7 +1058,7 @@ function sanitize_user_field($field, $value, $user_id, $context) {
$value = esc_attr($value);
} elseif ( 'db' == $context ) {
if ( $prefixed ) {
/** This filter is documented in wp-includes/post-functions.php */
/** This filter is documented in wp-includes/post.php */
$value = apply_filters( "pre_{$field}", $value );
} else {
@ -1078,7 +1078,7 @@ function sanitize_user_field($field, $value, $user_id, $context) {
// Use display filters by default.
if ( $prefixed ) {
/** This filter is documented in wp-includes/post-functions.php */
/** This filter is documented in wp-includes/post.php */
$value = apply_filters( $field, $value, $user_id, $context );
} else {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-beta4-35724';
$wp_version = '4.4-beta4-35725';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

6
wp-includes/widgets.php
View File

@ -618,11 +618,11 @@ function dynamic_sidebar( $index = 1 ) {
$sidebars_widgets = wp_get_sidebars_widgets();
if ( empty( $wp_registered_sidebars[ $index ] ) || empty( $sidebars_widgets[ $index ] ) || ! is_array( $sidebars_widgets[ $index ] ) ) {
/** This action is documented in wp-includes/widget-functions.php */
/** This action is documented in wp-includes/widget.php */
do_action( 'dynamic_sidebar_before', $index, false );
/** This action is documented in wp-includes/widget-functions.php */
/** This action is documented in wp-includes/widget.php */
do_action( 'dynamic_sidebar_after', $index, false );
/** This filter is documented in wp-includes/widget-functions.php */
/** This filter is documented in wp-includes/widget.php */
return apply_filters( 'dynamic_sidebar_has_widgets', false, $index );
}