From 1a18262fd538015c456da2a6706b12a50090761d Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Tue, 24 Jan 2017 23:29:42 +0000 Subject: [PATCH] Menus: Prevent notice thrown in class-walker-page.php. Calling `Walker_Page::walk()` directly was causing an `Undefined index: item_spacing` notice to be thrown, this adds an `isset()` check to prevent it. Props bhargavbhandari90. Fixes #39564. Built from https://develop.svn.wordpress.org/trunk@39949 git-svn-id: http://core.svn.wordpress.org/trunk@39886 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-walker-page.php | 8 ++++---- wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/class-walker-page.php b/wp-includes/class-walker-page.php index 3fcaa67a86..30831bbc8a 100644 --- a/wp-includes/class-walker-page.php +++ b/wp-includes/class-walker-page.php @@ -53,7 +53,7 @@ class Walker_Page extends Walker { * Default empty array. */ public function start_lvl( &$output, $depth = 0, $args = array() ) { - if ( 'preserve' === $args['item_spacing'] ) { + if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) { $t = "\t"; $n = "\n"; } else { @@ -78,7 +78,7 @@ class Walker_Page extends Walker { * Default empty array. */ public function end_lvl( &$output, $depth = 0, $args = array() ) { - if ( 'preserve' === $args['item_spacing'] ) { + if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) { $t = "\t"; $n = "\n"; } else { @@ -103,7 +103,7 @@ class Walker_Page extends Walker { * @param int $current_page Optional. Page ID. Default 0. */ public function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) { - if ( 'preserve' === $args['item_spacing'] ) { + if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) { $t = "\t"; $n = "\n"; } else { @@ -196,7 +196,7 @@ class Walker_Page extends Walker { * @param array $args Optional. Array of arguments. Default empty array. */ public function end_el( &$output, $page, $depth = 0, $args = array() ) { - if ( 'preserve' === $args['item_spacing'] ) { + if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) { $t = "\t"; $n = "\n"; } else { diff --git a/wp-includes/version.php b/wp-includes/version.php index 20c0f55385..1ada79fbc2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.8-alpha-39948'; +$wp_version = '4.8-alpha-39949'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.