| @@ -80,18 +80,15 @@ | ||
| 80 | 80 | |
| 81 | 81 | $items = wp_get_nav_menu_items( $menu_obj->term_id ); |
| 82 | 82 | if ( is_array( $items ) && array() !== $items ) { |
| 83 | 83 | foreach ( $items as $item ) { |
| 84 | - array_push( | |
| 85 | - $menu['items'], | |
| 86 | - array( | |
| 87 | - 'item_id' => $item->ID, | |
| 88 | - 'title' => $item->title, | |
| 89 | - 'url' => $item->url, | |
| 90 | - 'object' => $item->object, | |
| 91 | - 'menu_order' => $item->menu_order, | |
| 92 | - 'menu_item_parent' => $item->menu_item_parent, | |
| 93 | - ) | |
| 84 | + $menu['items'][] = array( | |
| 85 | + 'item_id' => $item->ID, | |
| 86 | + 'title' => $item->title, | |
| 87 | + 'url' => $item->url, | |
| 88 | + 'object' => $item->object, | |
| 89 | + 'menu_order' => $item->menu_order, | |
| 90 | + 'menu_item_parent' => $item->menu_item_parent, | |
| 94 | 91 | ); |
| 95 | 92 | } |
| 96 | 93 | } |
| 97 | 94 | } |
| @@ -285,9 +282,12 @@ | ||
| 285 | 282 | $menu_data = $func_args[1]['menu_data']; |
| 286 | 283 | $post_array = filter_input_array( INPUT_POST ); |
| 287 | 284 | $new_items = isset( $post_array['menu-item-title'] ) ? array_keys( $post_array['menu-item-title'] ) : array(); |
| 288 | 285 | $old_menu = $this->get_cached_menu( $menu_id ); |
| 289 | - $old_items = array_column( $old_menu['items'], 'item_id' ); | |
| 286 | + if ( ! is_array( $old_menu ) || ! isset( $old_menu['items'] ) || ! is_array( $old_menu['items'] ) ) { | |
| 287 | + return false; | |
| 288 | + } | |
| 289 | + $old_items = array_column( $old_menu['items'], 'item_id' ); | |
| 290 | 290 | |
| 291 | 291 | sort( $new_items ); |
| 292 | 292 | sort( $old_items ); |
| 293 | 293 | if ( $new_items === $old_items ) { |
| @@ -312,9 +312,9 @@ | ||
| 312 | 312 | /* translators: 1: Blog name, 2: User's display name, 3: Menu name */ |
| 313 | 313 | esc_html__( '%1$s %2$s updated menu "%3$s"', 'defender-security' ), |
| 314 | 314 | $blog_name, |
| 315 | 315 | $this->get_user_display( get_current_user_id() ), |
| 316 | - $menu_data['menu-name'] | |
| 316 | + $menu_data['menu-name'] ?? $old_menu['name'] | |
| 317 | 317 | ), |
| 318 | 318 | $this->type, |
| 319 | 319 | ); |
| 320 | 320 | } |
| @@ -339,9 +339,9 @@ | ||
| 339 | 339 | /* translators: 1: Blog name, 2: User's display name, 3: Menu name */ |
| 340 | 340 | esc_html__( '%1$s %2$s deleted menu "%3$s"', 'defender-security' ), |
| 341 | 341 | $blog_name, |
| 342 | 342 | $this->get_user_display( get_current_user_id() ), |
| 343 | - $old_menu['name'] | |
| 343 | + $old_menu['name'] ?? '', | |
| 344 | 344 | ), |
| 345 | 345 | $this->type, |
| 346 | 346 | ); |
| 347 | 347 | } |
