From dba75caef1efc20d9f9e88888069f11ead68bce8 Mon Sep 17 00:00:00 2001 From: ThierryA Date: Mon, 15 Jan 2018 14:53:58 +0100 Subject: [PATCH] Issue #839: bug fix + code improvement --- bin/add-test-widgets-to-sidebar.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/add-test-widgets-to-sidebar.php b/bin/add-test-widgets-to-sidebar.php index 6c7ad8a4b65..c1ab69511a0 100644 --- a/bin/add-test-widgets-to-sidebar.php +++ b/bin/add-test-widgets-to-sidebar.php @@ -310,7 +310,7 @@ function amp_menu() { $menus = wp_get_nav_menus(); $minimum_count = 4; foreach ( $menus as $menu ) { - if ( $menu->count > $minimum_count ) { + if ( $menu->count >= $minimum_count ) { return $menu->term_id; } } @@ -330,15 +330,14 @@ function amp_menu() { */ function amp_widget_already_in_sidebar( $widget, $sidebar ) { $sidebars = wp_get_sidebars_widgets(); - $widgets_in_sidebar = $sidebars[ $sidebar ]; - if ( empty( $widgets_in_sidebar ) ) { + if ( empty( $sidebars[ $sidebar ] ) ) { return false; } $id_base = $widget['widget']; $all_widget_data = get_option( 'widget_' . $id_base, array() ); - foreach ( $widgets_in_sidebar as $possible_widget ) { + foreach ( $sidebars[ $sidebar ] as $possible_widget ) { if ( false !== strpos( $possible_widget, $id_base ) ) { /* * If there aren't any settings for the widget, any instance of it is enough.