',
+ $args['next_text'],
+ $args['in_same_term'],
+ $args['excluded_terms'],
+ $args['taxonomy']
+ );
// Only add markup if there's somewhere to navigate to.
if ( $previous || $next ) {
@@ -2439,6 +2554,26 @@ function _navigation_markup( $links, $class = 'posts-navigation', $screen_reader
%3$s
';
+ /**
+ * Filter the navigation markup template.
+ *
+ * Note: The filtered template HTML must contain specifiers for the navigation
+ * class (%1$s), the screen-reader-text value (%2$s), and placement of the
+ * navigation links (%3$s):
+ *
+ *
+ *
+ * @since 4.4.0
+ *
+ * @param string $template The default template.
+ * @param string $class The class passed by the calling function.
+ * @return string Navigation template.
+ */
+ $template = apply_filters( 'navigation_markup_template', $template, $class );
+
return sprintf( $template, sanitize_html_class( $class ), esc_html( $screen_reader_text ), $links );
}
@@ -2500,7 +2635,7 @@ function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
function get_next_comments_link( $label = '', $max_page = 0 ) {
global $wp_query;
- if ( !is_singular() || !get_option('page_comments') )
+ if ( ! is_singular() )
return;
$page = get_query_var('cpage');
@@ -2554,7 +2689,7 @@ function next_comments_link( $label = '', $max_page = 0 ) {
* @return string|void HTML-formatted link for the previous page of comments.
*/
function get_previous_comments_link( $label = '' ) {
- if ( !is_singular() || !get_option('page_comments') )
+ if ( ! is_singular() )
return;
$page = get_query_var('cpage');
@@ -2598,11 +2733,11 @@ function previous_comments_link( $label = '' ) {
*
* @param string|array $args Optional args. See paginate_links().
* @return string|void Markup for pagination links.
-*/
+ */
function paginate_comments_links($args = array()) {
global $wp_rewrite;
- if ( !is_singular() || !get_option('page_comments') )
+ if ( ! is_singular() )
return;
$page = get_query_var('cpage');
@@ -2629,6 +2764,105 @@ function paginate_comments_links($args = array()) {
return $page_links;
}
+/**
+ * Returns navigation to next/previous set of comments when applicable.
+ *
+ * @since 4.4.0
+ *
+ * @param array $args {
+ * Optional. Default comments navigation arguments.
+ *
+ * @type string $prev_text Anchor text to display in the previous comments link. Default 'Older comments'.
+ * @type string $next_text Anchor text to display in the next comments link. Default 'Newer comments'.
+ * @type string $screen_reader_text Screen reader text for nav element. Default 'Comments navigation'.
+ * }
+ * @return string Markup for comments links.
+ */
+function get_the_comments_navigation( $args = array() ) {
+ $navigation = '';
+
+ // Are there comments to navigate through?
+ if ( get_comment_pages_count() > 1 ) {
+ $args = wp_parse_args( $args, array(
+ 'prev_text' => __( 'Older comments' ),
+ 'next_text' => __( 'Newer comments' ),
+ 'screen_reader_text' => __( 'Comments navigation' ),
+ ) );
+
+ $prev_link = get_previous_comments_link( $args['prev_text'] );
+ $next_link = get_next_comments_link( $args['next_text'] );
+
+ if ( $prev_link ) {
+ $navigation .= '
' . $prev_link . '
';
+ }
+
+ if ( $next_link ) {
+ $navigation .= '
' . $next_link . '
';
+ }
+
+ $navigation = _navigation_markup( $navigation, 'comment-navigation', $args['screen_reader_text'] );
+ }
+
+ return $navigation;
+}
+
+/**
+ * Displays navigation to next/previous set of comments when applicable.
+ *
+ * @since 4.4.0
+ *
+ * @param array $args See {@see get_the_comments_navigation()} for available arguments.
+ */
+function the_comments_navigation( $args = array() ) {
+ echo get_the_comments_navigation( $args );
+}
+
+/**
+ * Returns a paginated navigation to next/previous set of comments,
+ * when applicable.
+ *
+ * @since 4.4.0
+ *
+ * @see paginate_comments_links()
+ *
+ * @param array $args {
+ * Optional. Default pagination arguments.
+ *
+ * @type string $screen_reader_text Screen reader text for nav element. Default 'Comments navigation'.
+ * }
+ * @return string Markup for pagination links.
+ */
+function get_the_comments_pagination( $args = array() ) {
+ $navigation = '';
+ $args = wp_parse_args( $args, array(
+ 'screen_reader_text' => __( 'Comments navigation' ),
+ ) );
+ $args['echo'] = false;
+
+ // Make sure we get plain links, so we get a string we can work with.
+ $args['type'] = 'plain';
+
+ $links = paginate_comments_links( $args );
+
+ if ( $links ) {
+ $navigation = _navigation_markup( $links, 'comments-pagination', $args['screen_reader_text'] );
+ }
+
+ return $navigation;
+}
+
+/**
+ * Displays a paginated navigation to next/previous set of comments,
+ * when applicable.
+ *
+ * @since 4.4.0
+ *
+ * @param array $args See {@see get_the_comments_pagination()} for available arguments.
+ */
+function the_comments_pagination( $args = array() ) {
+ echo get_the_comments_pagination( $args );
+}
+
/**
* Retrieve the Press This bookmarklet link.
*
@@ -2692,7 +2926,7 @@ function get_shortcut_link() {
}
/**
- * Retrieve the home url for the current site.
+ * Retrieve the URL for the current site where the front end is accessible.
*
* Returns the 'home' option with the appropriate protocol, 'https' if
* {@see is_ssl()} and 'http' otherwise. If `$scheme` is 'http' or 'https',
@@ -2700,17 +2934,17 @@ function get_shortcut_link() {
*
* @since 3.0.0
*
- * @param string $path Optional. Path relative to the home url. Default empty.
- * @param string $scheme Optional. Scheme to give the home url context. Accepts
- * 'http', 'https', or 'relative'. Default null.
+ * @param string $path Optional. Path relative to the home url. Default empty.
+ * @param string|null $scheme Optional. Scheme to give the home url context. Accepts
+ * 'http', 'https', 'relative', 'rest', or null. Default null.
* @return string Home url link with optional path appended.
-*/
+ */
function home_url( $path = '', $scheme = null ) {
return get_home_url( null, $path, $scheme );
}
/**
- * Retrieve the home url for a given site.
+ * Retrieve the URL for a given site where the front end is accessible.
*
* Returns the 'home' option with the appropriate protocol, 'https' if
* {@see is_ssl()} and 'http' otherwise. If `$scheme` is 'http' or 'https',
@@ -2721,13 +2955,15 @@ function home_url( $path = '', $scheme = null ) {
*
* @global string $pagenow
*
- * @param int $blog_id Optional. Blog ID. Default null (current blog).
- * @param string $path Optional. Path relative to the home URL. Default empty.
- * @param string|null $orig_scheme Optional. Scheme to give the home URL context. Accepts
- * 'http', 'https', 'relative', or null. Default null.
+ * @param int $blog_id Optional. Site ID. Default null (current site).
+ * @param string $path Optional. Path relative to the home URL. Default empty.
+ * @param string|null $scheme Optional. Scheme to give the home URL context. Accepts
+ * 'http', 'https', 'relative', 'rest', or null. Default null.
* @return string Home URL link with optional path appended.
-*/
+ */
function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
+ global $pagenow;
+
$orig_scheme = $scheme;
if ( empty( $blog_id ) || !is_multisite() ) {
@@ -2739,7 +2975,7 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
}
if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
- if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] )
+ if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
$scheme = 'https';
else
$scheme = parse_url( $url, PHP_URL_SCHEME );
@@ -2757,14 +2993,16 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
*
* @param string $url The complete home URL including scheme and path.
* @param string $path Path relative to the home URL. Blank string if no path is specified.
- * @param string|null $orig_scheme Scheme to give the home URL context. Accepts 'http', 'https', 'relative' or null.
- * @param int|null $blog_id Blog ID, or null for the current blog.
+ * @param string|null $orig_scheme Scheme to give the home URL context. Accepts 'http', 'https',
+ * 'relative', 'rest', or null.
+ * @param int|null $blog_id Site ID, or null for the current site.
*/
return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
}
/**
- * Retrieve the site url for the current site.
+ * Retrieve the URL for the current site where WordPress application files
+ * (e.g. wp-blog-header.php or the wp-admin/ folder) are accessible.
*
* Returns the 'site_url' option with the appropriate protocol, 'https' if
* is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
@@ -2775,13 +3013,14 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
* @param string $path Optional. Path relative to the site url.
* @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme().
* @return string Site url link with optional path appended.
-*/
+ */
function site_url( $path = '', $scheme = null ) {
return get_site_url( null, $path, $scheme );
}
/**
- * Retrieve the site url for a given site.
+ * Retrieve the URL for a given site where WordPress application files
+ * (e.g. wp-blog-header.php or the wp-admin/ folder) are accessible.
*
* Returns the 'site_url' option with the appropriate protocol, 'https' if
* {@see is_ssl()} and 'http' otherwise. If `$scheme` is 'http' or 'https',
@@ -2789,13 +3028,13 @@ function site_url( $path = '', $scheme = null ) {
*
* @since 3.0.0
*
- * @param int $blog_id Optional. Blog ID. Default null (current site).
+ * @param int $blog_id Optional. Site ID. Default null (current site).
* @param string $path Optional. Path relative to the site url. Default empty.
* @param string $scheme Optional. Scheme to give the site url context. Accepts
* 'http', 'https', 'login', 'login_post', 'admin', or
* 'relative'. Default null.
* @return string Site url link with optional path appended.
-*/
+ */
function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
if ( empty( $blog_id ) || !is_multisite() ) {
$url = get_option( 'siteurl' );
@@ -2819,7 +3058,7 @@ function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
* @param string $path Path relative to the site URL. Blank string if no path is specified.
* @param string|null $scheme Scheme to give the site URL context. Accepts 'http', 'https', 'login',
* 'login_post', 'admin', 'relative' or null.
- * @param int|null $blog_id Blog ID, or null for the current blog.
+ * @param int|null $blog_id Site ID, or null for the current site.
*/
return apply_filters( 'site_url', $url, $path, $scheme, $blog_id );
}
@@ -2832,7 +3071,7 @@ function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
* @param string $path Optional path relative to the admin url.
* @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
* @return string Admin url link with optional path appended.
-*/
+ */
function admin_url( $path = '', $scheme = 'admin' ) {
return get_admin_url( null, $path, $scheme );
}
@@ -2842,13 +3081,13 @@ function admin_url( $path = '', $scheme = 'admin' ) {
*
* @since 3.0.0
*
- * @param int $blog_id Optional. Blog ID. Default null (current site).
+ * @param int $blog_id Optional. Site ID. Default null (current site).
* @param string $path Optional. Path relative to the admin url. Default empty.
* @param string $scheme Optional. The scheme to use. Accepts 'http' or 'https',
* to force those schemes. Default 'admin', which obeys
* {@see force_ssl_admin()} and {@see is_ssl()}.
* @return string Admin url link with optional path appended.
-*/
+ */
function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
$url = get_site_url($blog_id, 'wp-admin/', $scheme);
@@ -2862,7 +3101,7 @@ function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
*
* @param string $url The complete admin area URL including scheme and path.
* @param string $path Path relative to the admin area URL. Blank string if no path is specified.
- * @param int|null $blog_id Blog ID, or null for the current blog.
+ * @param int|null $blog_id Site ID, or null for the current site.
*/
return apply_filters( 'admin_url', $url, $path, $blog_id );
}
@@ -2875,7 +3114,7 @@ function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
* @param string $path Optional. Path relative to the includes url.
* @param string $scheme Optional. Scheme to give the includes url context.
* @return string Includes url link with optional path appended.
-*/
+ */
function includes_url( $path = '', $scheme = null ) {
$url = site_url( '/' . WPINC . '/', $scheme );
@@ -2901,7 +3140,7 @@ function includes_url( $path = '', $scheme = null ) {
*
* @param string $path Optional. Path relative to the content url.
* @return string Content url link with optional path appended.
-*/
+ */
function content_url($path = '') {
$url = set_url_scheme( WP_CONTENT_URL );
@@ -2933,7 +3172,7 @@ function content_url($path = '') {
* The URL will be relative to its directory. Default empty.
* Typically this is done by passing `__FILE__` as the argument.
* @return string Plugins URL link with optional paths appended.
-*/
+ */
function plugins_url( $path = '', $plugin = '' ) {
$path = wp_normalize_path( $path );
@@ -2983,7 +3222,7 @@ function plugins_url( $path = '', $plugin = '' ) {
* @param string $path Optional. Path relative to the site url.
* @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme().
* @return string Site url link with optional path appended.
-*/
+ */
function network_site_url( $path = '', $scheme = null ) {
if ( ! is_multisite() )
return site_url($path, $scheme);
@@ -3025,7 +3264,7 @@ function network_site_url( $path = '', $scheme = null ) {
* @param string $scheme Optional. Scheme to give the home url context. Accepts
* 'http', 'https', or 'relative'. Default null.
* @return string Home url link with optional path appended.
-*/
+ */
function network_home_url( $path = '', $scheme = null ) {
if ( ! is_multisite() )
return home_url($path, $scheme);
@@ -3066,7 +3305,7 @@ function network_home_url( $path = '', $scheme = null ) {
* @param string $path Optional path relative to the admin url.
* @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
* @return string Admin url link with optional path appended.
-*/
+ */
function network_admin_url( $path = '', $scheme = 'admin' ) {
if ( ! is_multisite() )
return admin_url( $path, $scheme );
@@ -3096,7 +3335,7 @@ function network_admin_url( $path = '', $scheme = 'admin' ) {
* @param string $path Optional path relative to the admin url.
* @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
* @return string Admin url link with optional path appended.
-*/
+ */
function user_admin_url( $path = '', $scheme = 'admin' ) {
$url = network_site_url('wp-admin/user/', $scheme);
@@ -3116,14 +3355,14 @@ function user_admin_url( $path = '', $scheme = 'admin' ) {
}
/**
- * Retrieve the url to the admin area for either the current blog or the network depending on context.
+ * Retrieve the url to the admin area for either the current site or the network depending on context.
*
* @since 3.1.0
*
* @param string $path Optional path relative to the admin url.
* @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
* @return string Admin url link with optional path appended.
-*/
+ */
function self_admin_url($path = '', $scheme = 'admin') {
if ( is_network_admin() )
return network_admin_url($path, $scheme);
@@ -3134,12 +3373,14 @@ function self_admin_url($path = '', $scheme = 'admin') {
}
/**
- * Set the scheme for a URL
+ * Sets the scheme for a URL.
*
* @since 3.4.0
+ * @since 4.4.0 The 'rest' scheme was added.
*
- * @param string $url Absolute url that includes a scheme
- * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
+ * @param string $url Absolute url that includes a scheme
+ * @param string|null $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login',
+ * 'login_post', 'admin', 'relative', 'rest', 'rpc', or null. Default null.
* @return string $url URL with chosen scheme.
*/
function set_url_scheme( $url, $scheme = null ) {
@@ -3170,10 +3411,10 @@ function set_url_scheme( $url, $scheme = null ) {
*
* @since 3.4.0
*
- * @param string $url The complete URL including scheme and path.
- * @param string $scheme Scheme applied to the URL. One of 'http', 'https', or 'relative'.
- * @param string $orig_scheme Scheme requested for the URL. One of 'http', 'https', 'login',
- * 'login_post', 'admin', 'rpc', or 'relative'.
+ * @param string $url The complete URL including scheme and path.
+ * @param string $scheme Scheme applied to the URL. One of 'http', 'https', or 'relative'.
+ * @param string|null $orig_scheme Scheme requested for the URL. One of 'http', 'https', 'login',
+ * 'login_post', 'admin', 'relative', 'rest', 'rpc', or null.
*/
return apply_filters( 'set_url_scheme', $url, $scheme, $orig_scheme );
}
@@ -3183,12 +3424,12 @@ function set_url_scheme( $url, $scheme = null ) {
*
* If a user does not belong to any site, the global user dashboard is used. If the user belongs to the current site,
* the dashboard for the current site is returned. If the user cannot edit the current site, the dashboard to the user's
- * primary blog is returned.
+ * primary site is returned.
*
* @since 3.1.0
*
* @param int $user_id Optional. User ID. Defaults to current user.
- * @param string $path Optional path relative to the dashboard. Use only paths known to both blog and user admins.
+ * @param string $path Optional path relative to the dashboard. Use only paths known to both site and user admins.
* @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
* @return string Dashboard url link with optional path appended.
*/
@@ -3264,27 +3505,36 @@ function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
* Output rel=canonical for singular queries.
*
* @since 2.9.0
- *
- * @global WP_Query $wp_the_query
-*/
+ */
function rel_canonical() {
- if ( !is_singular() )
+ if ( ! is_singular() ) {
return;
+ }
- global $wp_the_query;
- if ( !$id = $wp_the_query->get_queried_object_id() )
+ if ( ! $id = get_queried_object_id() ) {
return;
+ }
- $link = get_permalink( $id );
+ $url = get_permalink( $id );
- if ( $page = get_query_var('cpage') )
- $link = get_comments_pagenum_link( $page );
+ $page = get_query_var( 'page' );
+ if ( $page >= 2 ) {
+ if ( '' == get_option( 'permalink_structure' ) ) {
+ $url = add_query_arg( 'page', $page, $url );
+ } else {
+ $url = trailingslashit( $url ) . user_trailingslashit( $page, 'single_paged' );
+ }
+ }
- echo "\n";
+ $cpage = get_query_var( 'cpage' );
+ if ( $cpage ) {
+ $url = get_comments_pagenum_link( $cpage );
+ }
+ echo '\n";
}
/**
- * Return a shortlink for a post, page, attachment, or blog.
+ * Return a shortlink for a post, page, attachment, or a site.
*
* This function exists to provide a shortlink tag that all themes and plugins can target. A plugin must hook in to
* provide the actual shortlinks. Default shortlink support is limited to providing ?p= style links for posts.
@@ -3293,10 +3543,8 @@ function rel_canonical() {
*
* @since 3.0.0.
*
- * @global WP_Query $wp_query
- *
- * @param int $id A post or blog id. Default is 0, which means the current post or blog.
- * @param string $context Whether the id is a 'blog' id, 'post' id, or 'media' id.
+ * @param int $id A post or site id. Default is 0, which means the current post or site.
+ * @param string $context Whether the id is a 'site' id, 'post' id, or 'media' id.
* If 'post', the post_type of the post is consulted.
* If 'query', the current query is consulted to determine the id and context.
* Default is 'post'.
@@ -3319,13 +3567,13 @@ function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) {
*/
$shortlink = apply_filters( 'pre_get_shortlink', false, $id, $context, $allow_slugs );
- if ( false !== $shortlink )
+ if ( false !== $shortlink ) {
return $shortlink;
+ }
- global $wp_query;
$post_id = 0;
if ( 'query' == $context && is_singular() ) {
- $post_id = $wp_query->get_queried_object_id();
+ $post_id = get_queried_object_id();
$post = get_post( $post_id );
} elseif ( 'post' == $context ) {
$post = get_post( $id );
@@ -3444,7 +3692,7 @@ function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
* @since 4.2.0
*
* @param mixed $id_or_email The Gravatar to retrieve a URL for. Accepts a user_id, gravatar md5 hash,
- * user email, WP_User object, WP_Post object, or comment object.
+ * user email, WP_User object, WP_Post object, or WP_Comment object.
* @param array $args {
* Optional. Arguments to return instead of the default arguments.
*
@@ -3452,7 +3700,7 @@ function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
* @type string $default URL for the default image or a default type. Accepts '404' (return
* a 404 instead of a default image), 'retro' (8bit), 'monsterid' (monster),
* 'wavatar' (cartoon face), 'indenticon' (the "quilt"), 'mystery', 'mm',
- * or 'mysterman' (The Oyster Man), 'blank' (transparent GIF), or
+ * or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF), or
* 'gravatar_default' (the Gravatar logo). Default is the value of the
* 'avatar_default' option, with a fallback of 'mystery'.
* @type bool $force_default Whether to always show the default image, never the Gravatar. Default false.
@@ -3475,8 +3723,8 @@ function get_avatar_url( $id_or_email, $args = null ) {
*
* @since 4.2.0
*
- * @param mixed $id_or_email The Gravatar to check the data against. Accepts a user_id, gravatar md5 hash,
- * user email, WP_User object, WP_Post object, or comment object.
+ * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
+ * user email, WP_User object, WP_Post object, or WP_Comment object.
* @param array $args {
* Optional. Arguments to return instead of the default arguments.
*
@@ -3486,7 +3734,7 @@ function get_avatar_url( $id_or_email, $args = null ) {
* @type string $default URL for the default image or a default type. Accepts '404' (return
* a 404 instead of a default image), 'retro' (8bit), 'monsterid' (monster),
* 'wavatar' (cartoon face), 'indenticon' (the "quilt"), 'mystery', 'mm',
- * or 'mysterman' (The Oyster Man), 'blank' (transparent GIF), or
+ * or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF), or
* 'gravatar_default' (the Gravatar logo). Default is the value of the
* 'avatar_default' option, with a fallback of 'mystery'.
* @type bool $force_default Whether to always show the default image, never the Gravatar. Default false.
@@ -3576,8 +3824,9 @@ function get_avatar_data( $id_or_email, $args = null ) {
*
* @since 4.2.0
*
- * @param array $args Arguments passed to get_avatar_data(), after processing.
- * @param int|object|string $id_or_email A user ID, email address, or comment object.
+ * @param array $args Arguments passed to get_avatar_data(), after processing.
+ * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
+ * user email, WP_User object, WP_Post object, or WP_Comment object.
*/
$args = apply_filters( 'pre_get_avatar_data', $args, $id_or_email );
@@ -3589,6 +3838,10 @@ function get_avatar_data( $id_or_email, $args = null ) {
$email_hash = '';
$user = $email = false;
+ if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
+ $id_or_email = get_comment( $id_or_email );
+ }
+
// Process the user identifier.
if ( is_numeric( $id_or_email ) ) {
$user = get_user_by( 'id', absint( $id_or_email ) );
@@ -3606,9 +3859,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
} elseif ( $id_or_email instanceof WP_Post ) {
// Post Object
$user = get_user_by( 'id', (int) $id_or_email->post_author );
- } elseif ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
- // Comment Object
-
+ } elseif ( $id_or_email instanceof WP_Comment ) {
/**
* Filter the list of allowed comment types for retrieving avatars.
*
@@ -3671,9 +3922,10 @@ function get_avatar_data( $id_or_email, $args = null ) {
*
* @since 4.2.0
*
- * @param string $url The URL of the avatar.
- * @param int|object|string $id_or_email A user ID, email address, or comment object.
- * @param array $args Arguments passed to get_avatar_data(), after processing.
+ * @param string $url The URL of the avatar.
+ * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
+ * user email, WP_User object, WP_Post object, or WP_Comment object.
+ * @param array $args Arguments passed to get_avatar_data(), after processing.
*/
$args['url'] = apply_filters( 'get_avatar_url', $url, $id_or_email, $args );
@@ -3682,8 +3934,9 @@ function get_avatar_data( $id_or_email, $args = null ) {
*
* @since 4.2.0
*
- * @param array $args Arguments passed to get_avatar_data(), after processing.
- * @param int|object|string $id_or_email A user ID, email address, or comment object.
+ * @param array $args Arguments passed to get_avatar_data(), after processing.
+ * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
+ * user email, WP_User object, WP_Post object, or WP_Comment object.
*/
return apply_filters( 'get_avatar_data', $args, $id_or_email );
}