WordPress.org
Get WordPress

Make WordPress Core

Changeset 35725


Ignore:
Timestamp:
11/22/2015 03:50:32 AM (8 years ago)
Author:
SergeyBiryukov
Message:

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

Partially reverts [33954].

Fixes #33413.

Location:
trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/includes/template.php

    r35718 r35725  
    19491949<!--[if !(IE 8) ]><!-->
    19501950<html xmlns="http://www.w3.org/1999/xhtml" class="<?php echo $admin_html_class; ?>" <?php
    1951     /** This action is documented in wp-admin/includes/template-functions.php */
     1951    /** This action is documented in wp-admin/includes/template.php */
    19521952    do_action( 'admin_xml_ns' );
    19531953?> <?php language_attributes(); ?>>

  • trunk/src/wp-admin/includes/user.php

    r35630 r35725  
    143143        $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
    144144
    145     /** This filter is documented in wp-includes/user-functions.php */
     145    /** This filter is documented in wp-includes/user.php */
    146146    $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
    147147

  • trunk/src/wp-includes/bookmark.php

    r33954 r35725  
    379379
    380380    if ( 'edit' == $context ) {
    381         /** This filter is documented in wp-includes/post-functions.php */
     381        /** This filter is documented in wp-includes/post.php */
    382382        $value = apply_filters( "edit_$field", $value, $bookmark_id );
    383383
    … …  
    388388        }
    389389    } elseif ( 'db' == $context ) {
    390         /** This filter is documented in wp-includes/post-functions.php */
     390        /** This filter is documented in wp-includes/post.php */
    391391        $value = apply_filters( "pre_$field", $value );
    392392    } else {
    393         /** This filter is documented in wp-includes/post-functions.php */
     393        /** This filter is documented in wp-includes/post.php */
    394394        $value = apply_filters( $field, $value, $bookmark_id, $context );
    395395

  • trunk/src/wp-includes/comment.php

    r35718 r35725  
    11191119    clean_comment_cache( $comment->comment_ID );
    11201120
    1121     /** This action is documented in wp-includes/comment-functions.php */
     1121    /** This action is documented in wp-includes/comment.php */
    11221122    do_action( 'wp_set_comment_status', $comment->comment_ID, 'delete' );
    11231123
    … …  
    15671567        $commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_ID'] );
    15681568    } elseif ( isset( $commentdata['user_id'] ) ) {
    1569         /** This filter is documented in wp-includes/comment-functions.php */
     1569        /** This filter is documented in wp-includes/comment.php */
    15701570        $commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_id'] );
    15711571    }
    … …  
    15791579     */
    15801580    $commentdata['comment_agent'] = apply_filters( 'pre_comment_user_agent', ( isset( $commentdata['comment_agent'] ) ? $commentdata['comment_agent'] : '' ) );
    1581     /** This filter is documented in wp-includes/comment-functions.php */
     1581    /** This filter is documented in wp-includes/comment.php */
    15821582    $commentdata['comment_author'] = apply_filters( 'pre_comment_author_name', $commentdata['comment_author'] );
    15831583    /**
    … …  
    15971597     */
    15981598    $commentdata['comment_author_IP'] = apply_filters( 'pre_comment_user_ip', $commentdata['comment_author_IP'] );
    1599     /** This filter is documented in wp-includes/comment-functions.php */
     1599    /** This filter is documented in wp-includes/comment.php */
    16001600    $commentdata['comment_author_url'] = apply_filters( 'pre_comment_author_url', $commentdata['comment_author_url'] );
    1601     /** This filter is documented in wp-includes/comment-functions.php */
     1601    /** This filter is documented in wp-includes/comment.php */
    16021602    $commentdata['comment_author_email'] = apply_filters( 'pre_comment_author_email', $commentdata['comment_author_email'] );
    16031603    $commentdata['filtered'] = true;
    … …  
    17601760    $maybe_notify = ( '0' == $comment->comment_approved );
    17611761
    1762     /** This filter is documented in wp-includes/comment-functions.php */
     1762    /** This filter is documented in wp-includes/comment.php */
    17631763    $maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_ID );
    17641764
    … …  
    20702070     */
    20712071    do_action( 'wp_update_comment_count', $post_id, $new, $old );
    2072     /** This action is documented in wp-includes/post-functions.php */
     2072    /** This action is documented in wp-includes/post.php */
    20732073    do_action( 'edit_post', $post_id, $post );
    20742074
    … …  
    25872587    $post = get_post($post_id);
    25882588
    2589     /** This filter is documented in wp-includes/comment-functions.php */
     2589    /** This filter is documented in wp-includes/comment.php */
    25902590    $post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
    25912591    if ( ! in_array( $post->post_type, $post_types ) )

  • trunk/src/wp-includes/media.php

    r35716 r35725  
    756756
    757757        if ( $icon && $src = wp_mime_type_icon( $attachment_id ) ) {
    758             /** This filter is documented in wp-includes/post-functions.php */
     758            /** This filter is documented in wp-includes/post.php */
    759759            $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
    760760

  • trunk/src/wp-includes/meta.php

    r35718 r35725  
    533533    }
    534534
    535     /** This filter is documented in wp-includes/meta-functions.php */
     535    /** This filter is documented in wp-includes/meta.php */
    536536    $check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, true );
    537537    if ( null !== $check )
    … …  
    654654        $where[$id_column] = $meta_id;
    655655
    656         /** This action is documented in wp-includes/meta-functions.php */
     656        /** This action is documented in wp-includes/meta.php */
    657657        do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
    658658
    659659        if ( 'post' == $meta_type ) {
    660             /** This action is documented in wp-includes/meta-functions.php */
     660            /** This action is documented in wp-includes/meta.php */
    661661            do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
    662662        }
    … …  
    670670        wp_cache_delete($object_id, $meta_type . '_meta');
    671671
    672         /** This action is documented in wp-includes/meta-functions.php */
     672        /** This action is documented in wp-includes/meta.php */
    673673        do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
    674674
    675675        if ( 'post' == $meta_type ) {
    676             /** This action is documented in wp-includes/meta-functions.php */
     676            /** This action is documented in wp-includes/meta.php */
    677677            do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
    678678        }
    … …  
    722722        $object_id = $meta->{$column};
    723723
    724         /** This action is documented in wp-includes/meta-functions.php */
     724        /** This action is documented in wp-includes/meta.php */
    725725        do_action( "delete_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value );
    726726
    … …  
    746746        wp_cache_delete($object_id, $meta_type . '_meta');
    747747
    748         /** This action is documented in wp-includes/meta-functions.php */
     748        /** This action is documented in wp-includes/meta.php */
    749749        do_action( "deleted_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value );
    750750

  • trunk/src/wp-includes/ms-functions.php

    r35630 r35725  
    432432    }
    433433
    434     /** This filter is documented in wp-includes/user-functions.php */
     434    /** This filter is documented in wp-includes/user.php */
    435435    $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
    436436

  • trunk/src/wp-includes/post.php

    r35718 r35725  
    21302130    $counts = wp_cache_get( $cache_key, 'counts' );
    21312131    if ( false !== $counts ) {
    2132         /** This filter is documented in wp-includes/post-functions.php */
     2132        /** This filter is documented in wp-includes/post.php */
    21332133        return apply_filters( 'wp_count_posts', $counts, $type, $perm );
    21342134    }
    … …  
    34853485    wp_transition_post_status( 'publish', $old_status, $post );
    34863486
    3487     /** This action is documented in wp-includes/post-functions.php */
     3487    /** This action is documented in wp-includes/post.php */
    34883488    do_action( 'edit_post', $post->ID, $post );
    34893489
    3490     /** This action is documented in wp-includes/post-functions.php */
     3490    /** This action is documented in wp-includes/post.php */
    34913491    do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
    34923492
    3493     /** This action is documented in wp-includes/post-functions.php */
     3493    /** This action is documented in wp-includes/post.php */
    34943494    do_action( 'save_post', $post->ID, $post, true );
    34953495
    3496     /** This action is documented in wp-includes/post-functions.php */
     3496    /** This action is documented in wp-includes/post.php */
    34973497    do_action( 'wp_insert_post', $post->ID, $post, true );
    34983498}
    … …  
    44044404        // Convert to WP_Post instances.
    44054405        $pages = array_map( 'get_post', $cache );
    4406         /** This filter is documented in wp-includes/post-functions.php */
     4406        /** This filter is documented in wp-includes/post.php */
    44074407        $pages = apply_filters( 'get_pages', $pages, $r );
    44084408        return $pages;
    … …  
    45464546
    45474547    if ( empty($pages) ) {
    4548         /** This filter is documented in wp-includes/post-functions.php */
     4548        /** This filter is documented in wp-includes/post.php */
    45494549        $pages = apply_filters( 'get_pages', array(), $r );
    45504550        return $pages;
    … …  
    47364736        delete_metadata_by_mid( 'post', $mid );
    47374737
    4738     /** This action is documented in wp-includes/post-functions.php */
     4738    /** This action is documented in wp-includes/post.php */
    47394739    do_action( 'delete_post', $post_id );
    47404740    $result = $wpdb->delete( $wpdb->posts, array( 'ID' => $post_id ) );
    … …  
    47424742        return false;
    47434743    }
    4744     /** This action is documented in wp-includes/post-functions.php */
     4744    /** This action is documented in wp-includes/post.php */
    47454745    do_action( 'deleted_post', $post_id );
    47464746

  • trunk/src/wp-includes/taxonomy.php

    r35718 r35725  
    14751475        wp_cache_add( $cache_key, array(), 'terms', DAY_IN_SECONDS );
    14761476
    1477         /** This filter is documented in wp-includes/taxonomy-functions.php */
     1477        /** This filter is documented in wp-includes/taxonomy.php */
    14781478        return apply_filters( 'get_terms', array(), $taxonomies, $args );
    14791479    }
    … …  
    15521552    }
    15531553
    1554     /** This filter is documented in wp-includes/taxonomy-functions.php */
     1554    /** This filter is documented in wp-includes/taxonomy.php */
    15551555    return apply_filters( 'get_terms', $terms, $taxonomies, $args );
    15561556}
    … …  
    26612661        $slug = sanitize_title($slug, $term_id);
    26622662
    2663         /** This action is documented in wp-includes/taxonomy-functions.php */
     2663        /** This action is documented in wp-includes/taxonomy.php */
    26642664        do_action( 'edit_terms', $term_id, $taxonomy );
    26652665        $wpdb->update( $wpdb->terms, compact( 'slug' ), compact( 'term_id' ) );
    26662666
    2667         /** This action is documented in wp-includes/taxonomy-functions.php */
     2667        /** This action is documented in wp-includes/taxonomy.php */
    26682668        do_action( 'edited_terms', $term_id, $taxonomy );
    26692669    }
    … …  
    33053305    do_action( "edit_$taxonomy", $term_id, $tt_id );
    33063306
    3307     /** This filter is documented in wp-includes/taxonomy-functions.php */
     3307    /** This filter is documented in wp-includes/taxonomy.php */
    33083308    $term_id = apply_filters( 'term_id_filter', $term_id, $tt_id );
    33093309
    … …  
    38633863            $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 ) );
    38643864
    3865         /** This action is documented in wp-includes/taxonomy-functions.php */
     3865        /** This action is documented in wp-includes/taxonomy.php */
    38663866        do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
    38673867        $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
    38683868
    3869         /** This action is documented in wp-includes/taxonomy-functions.php */
     3869        /** This action is documented in wp-includes/taxonomy.php */
    38703870        do_action( 'edited_term_taxonomy', $term, $taxonomy->name );
    38713871    }
    … …  
    38903890        $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term ) );
    38913891
    3892         /** This action is documented in wp-includes/taxonomy-functions.php */
     3892        /** This action is documented in wp-includes/taxonomy.php */
    38933893        do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
    38943894        $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
    38953895
    3896         /** This action is documented in wp-includes/taxonomy-functions.php */
     3896        /** This action is documented in wp-includes/taxonomy.php */
    38973897        do_action( 'edited_term_taxonomy', $term, $taxonomy->name );
    38983898    }
    … …  
    46004600    if ( empty( $object_id ) ) {
    46014601
    4602         /** This filter is documented in wp-includes/taxonomy-functions.php */
     4602        /** This filter is documented in wp-includes/taxonomy.php */
    46034603        return apply_filters( 'get_ancestors', $ancestors, $object_id, $object_type, $resource_type );
    46044604    }

  • trunk/src/wp-includes/user.php

    r35718 r35725  
    10351035        if ( $prefixed ) {
    10361036
    1037             /** This filter is documented in wp-includes/post-functions.php */
     1037            /** This filter is documented in wp-includes/post.php */
    10381038            $value = apply_filters( "edit_{$field}", $value, $user_id );
    10391039        } else {
    … …  
    10591059    } elseif ( 'db' == $context ) {
    10601060        if ( $prefixed ) {
    1061             /** This filter is documented in wp-includes/post-functions.php */
     1061            /** This filter is documented in wp-includes/post.php */
    10621062            $value = apply_filters( "pre_{$field}", $value );
    10631063        } else {
    … …  
    10791079        if ( $prefixed ) {
    10801080
    1081             /** This filter is documented in wp-includes/post-functions.php */
     1081            /** This filter is documented in wp-includes/post.php */
    10821082            $value = apply_filters( $field, $value, $user_id, $context );
    10831083        } else {

  • trunk/src/wp-includes/widgets.php

    r35718 r35725  
    619619    $sidebars_widgets = wp_get_sidebars_widgets();
    620620    if ( empty( $wp_registered_sidebars[ $index ] ) || empty( $sidebars_widgets[ $index ] ) || ! is_array( $sidebars_widgets[ $index ] ) ) {
    621         /** This action is documented in wp-includes/widget-functions.php */
     621        /** This action is documented in wp-includes/widget.php */
    622622        do_action( 'dynamic_sidebar_before', $index, false );
    623         /** This action is documented in wp-includes/widget-functions.php */
     623        /** This action is documented in wp-includes/widget.php */
    624624        do_action( 'dynamic_sidebar_after',  $index, false );
    625         /** This filter is documented in wp-includes/widget-functions.php */
     625        /** This filter is documented in wp-includes/widget.php */
    626626        return apply_filters( 'dynamic_sidebar_has_widgets', false, $index );
    627627    }
Note: See TracChangeset for help on using the changeset viewer.