From 67e82bc32a0677498249f28c165be35c3e28ae5e Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 9 Nov 2019 13:41:29 +0000 Subject: [PATCH] Docs: Correct the documentation placement for `wp_print_styles` and `shortcode_atts_{$shortcode}` hooks. Props jrf. See #48255. git-svn-id: https://develop.svn.wordpress.org/trunk@46688 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/functions.wp-styles.php | 11 +++++----- src/wp-includes/shortcodes.php | 29 +++++++++++++------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/wp-includes/functions.wp-styles.php b/src/wp-includes/functions.wp-styles.php index a60a9d6224..49c947c420 100644 --- a/src/wp-includes/functions.wp-styles.php +++ b/src/wp-includes/functions.wp-styles.php @@ -43,12 +43,13 @@ function wp_print_styles( $handles = false ) { if ( '' === $handles ) { // for wp_head $handles = false; } - /** - * Fires before styles in the $handles queue are printed. - * - * @since 2.6.0 - */ + if ( ! $handles ) { + /** + * Fires before styles in the $handles queue are printed. + * + * @since 2.6.0 + */ do_action( 'wp_print_styles' ); } diff --git a/src/wp-includes/shortcodes.php b/src/wp-includes/shortcodes.php index 465293d9f9..a5e806b40d 100644 --- a/src/wp-includes/shortcodes.php +++ b/src/wp-includes/shortcodes.php @@ -558,21 +558,22 @@ function shortcode_atts( $pairs, $atts, $shortcode = '' ) { $out[ $name ] = $default; } } - /** - * Filters a shortcode's default attributes. - * - * If the third parameter of the shortcode_atts() function is present then this filter is available. - * The third parameter, $shortcode, is the name of the shortcode. - * - * @since 3.6.0 - * @since 4.4.0 Added the `$shortcode` parameter. - * - * @param array $out The output array of shortcode attributes. - * @param array $pairs The supported attributes and their defaults. - * @param array $atts The user defined shortcode attributes. - * @param string $shortcode The shortcode name. - */ + if ( $shortcode ) { + /** + * Filters a shortcode's default attributes. + * + * If the third parameter of the shortcode_atts() function is present then this filter is available. + * The third parameter, $shortcode, is the name of the shortcode. + * + * @since 3.6.0 + * @since 4.4.0 Added the `$shortcode` parameter. + * + * @param array $out The output array of shortcode attributes. + * @param array $pairs The supported attributes and their defaults. + * @param array $atts The user defined shortcode attributes. + * @param string $shortcode The shortcode name. + */ $out = apply_filters( "shortcode_atts_{$shortcode}", $out, $pairs, $atts, $shortcode ); }