Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 07:37:44 +02:00
Code Issues Projects Releases Wiki Activity

Widgets: Do not use wrapping container in the admin.

Browse Source 
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.

Built from https://develop.svn.wordpress.org/trunk@49560


git-svn-id: http://core.svn.wordpress.org/trunk@49298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2020-11-10 20:40:09 +00:00
parent 135c75c396
commit 19b035f04b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.6-beta3-49559';
$wp_version = '5.6-beta3-49560';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

5
wp-includes/widgets.php
View File

@ -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'];
}