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

Remove `src` from duplicate hook comments for `get_avatar` and `get_avatar_data`. 

see #21195.
Built from https://develop.svn.wordpress.org/trunk@31480


git-svn-id: http://core.svn.wordpress.org/trunk@31461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-02-19 14:59:26 +00:00
parent 01bb8478ff
commit add5f9bdf2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/link-template.php
View File

@ -3482,7 +3482,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
$args = apply_filters( 'pre_get_avatar_data', $args, $id_or_email ); $args = apply_filters( 'pre_get_avatar_data', $args, $id_or_email );
if ( isset( $args['url'] ) && ! is_null( $args['url'] ) ) { if ( isset( $args['url'] ) && ! is_null( $args['url'] ) ) {
/** This filter is documented in src/wp-includes/link-template.php */ /** This filter is documented in wp-includes/link-template.php */
return apply_filters( 'get_avatar_data', $args, $id_or_email ); return apply_filters( 'get_avatar_data', $args, $id_or_email );
} }
@ -3519,7 +3519,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) ); $allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) { if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
$args['url'] = false; $args['url'] = false;
/** This filter is documented in src/wp-includes/link-template.php */ /** This filter is documented in wp-includes/link-template.php */
return apply_filters( 'get_avatar_data', $args, $id_or_email ); return apply_filters( 'get_avatar_data', $args, $id_or_email );
} }

2
wp-includes/pluggable.php
View File

@ -2162,7 +2162,7 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args =
*/ */
$avatar = apply_filters( 'pre_get_avatar', null, $id_or_email, $args ); $avatar = apply_filters( 'pre_get_avatar', null, $id_or_email, $args );
if ( ! is_null( $avatar ) ) { if ( ! is_null( $avatar ) ) {
/** This filter is documented in src/wp-includes/pluggable.php */ /** This filter is documented in wp-includes/pluggable.php */
return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args ); return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31479'; $wp_version = '4.2-alpha-31480';
/** /**
* 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.