From 9a14f55ace80b36b4c5d92a6e602d0eb73fb0423 Mon Sep 17 00:00:00 2001 From: Helen Hou-Sandi Date: Tue, 10 Nov 2020 20:38:59 +0000 Subject: [PATCH] Widgets: Do not use wrapping container in the admin. This is due to the new `before|after_sidebar` args, which are empty by default, but can introduce markup that causes admin JS to stop working. Also adds documentation for the `sprintf()` on `before_sidebar`. Props audrasjb, lpointet. See #19709. git-svn-id: https://develop.svn.wordpress.org/trunk@49560 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/widgets.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/widgets.php b/src/wp-includes/widgets.php index a7f54d697b..b30452e1fd 100644 --- a/src/wp-includes/widgets.php +++ b/src/wp-includes/widgets.php @@ -243,6 +243,7 @@ function register_sidebars( $number = 1, $args = array() ) { * @type string $after_title HTML content to append to the sidebar title when displayed. * Default is a closing h2 element. * @type string $before_sidebar HTML content to prepend to the sidebar when displayed. + * Receives the '$id' argument as %1$s and '$class' as %2$s. * Outputs after the {@see 'dynamic_sidebar_before'} action. * Default empty string. * @type string $after_sidebar HTML content to append to the sidebar when displayed. @@ -718,7 +719,7 @@ function dynamic_sidebar( $index = 1 ) { */ do_action( 'dynamic_sidebar_before', $index, true ); - if ( ! empty( $sidebar['before_sidebar'] ) ) { + if ( ! is_admin() && ! empty( $sidebar['before_sidebar'] ) ) { echo $sidebar['before_sidebar']; } @@ -823,7 +824,7 @@ function dynamic_sidebar( $index = 1 ) { } } - if ( ! empty( $sidebar['after_sidebar'] ) ) { + if ( ! is_admin() && ! empty( $sidebar['after_sidebar'] ) ) { echo $sidebar['after_sidebar']; }