From 0188ec7f1c504ffc331eb6acd8af6be9f469cbba Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Sat, 11 Apr 2015 21:33:14 +0000 Subject: [PATCH] Tell developers how to correctly silence `register_sidebar()` notices. * If we just tell them they they should set an `id` parameter, they might set an arbitrary one on an existing (i.e. not in-development) theme, causing widgets to be lost. * This way, we tell them to set it to the auto-generated `id` that the sidebar already has. * Widget content is not lost, and now their sidebar has a concrete handle. fixes #31675 git-svn-id: https://develop.svn.wordpress.org/trunk@32110 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/widgets.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/widgets.php b/src/wp-includes/widgets.php index 5e3431ff10..67282a9b3c 100644 --- a/src/wp-includes/widgets.php +++ b/src/wp-includes/widgets.php @@ -803,10 +803,7 @@ function register_sidebar($args = array()) { $i = count($wp_registered_sidebars) + 1; - if ( empty( $args['id'] ) ) { - /* translators: %s: the id argument */ - _doing_it_wrong( __FUNCTION__, sprintf( __( 'You should set %s in the arguments array.' ), 'id' ), '4.2.0' ); - } + $id_is_empty = empty( $args['id'] ); $defaults = array( 'name' => sprintf(__('Sidebar %d'), $i ), @@ -821,6 +818,11 @@ function register_sidebar($args = array()) { $sidebar = wp_parse_args( $args, $defaults ); + if ( $id_is_empty ) { + /* translators: %1$s: the id argument */ + _doing_it_wrong( __FUNCTION__, sprintf( __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.' ), 'id', $sidebar['name'], $sidebar['id'] ), '4.2.0' ); + } + $wp_registered_sidebars[$sidebar['id']] = $sidebar; add_theme_support('widgets');