WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Menus: Fix notices thrown by classes extending `Walker_Nav_Menu`. 

Methods in `Walker_Nav_Menu` can be called with multiple, incompatible `$args` objects so an `insset()` check is required to avoid throwing notices.

Introduced in [38523].

Fixes #35206.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Peter Wilson 2016-09-08 07:06:30 +00:00
parent 6cdab630cd
commit 06c51c0042
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-includes/class-walker-nav-menu.php
View File

@ -50,12 +50,12 @@ class Walker_Nav_Menu extends Walker {
* @param stdClass $args An object of wp_nav_menu() arguments. * @param stdClass $args An object of wp_nav_menu() arguments.
*/ */
public function start_lvl( &$output, $depth = 0, $args = array() ) { public function start_lvl( &$output, $depth = 0, $args = array() ) {
if ( 'preserve' === $args->item_spacing ) { if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
$t = "\t";
$n = "\n";
} else {
$t = ''; $t = '';
$n = ''; $n = '';
} else {
$t = "\t";
$n = "\n";
} }
$indent = str_repeat( $t, $depth ); $indent = str_repeat( $t, $depth );
$output .= "{$n}{$indent}<ul class=\"sub-menu\">{$n}"; $output .= "{$n}{$indent}<ul class=\"sub-menu\">{$n}";
@ -73,12 +73,12 @@ class Walker_Nav_Menu extends Walker {
* @param stdClass $args An object of wp_nav_menu() arguments. * @param stdClass $args An object of wp_nav_menu() arguments.
*/ */
public function end_lvl( &$output, $depth = 0, $args = array() ) { public function end_lvl( &$output, $depth = 0, $args = array() ) {
if ( 'preserve' === $args->item_spacing ) { if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
$t = "\t";
$n = "\n";
} else {
$t = ''; $t = '';
$n = ''; $n = '';
} else {
$t = "\t";
$n = "\n";
} }
$indent = str_repeat( $t, $depth ); $indent = str_repeat( $t, $depth );
$output .= "$indent</ul>{$n}"; $output .= "$indent</ul>{$n}";
@ -99,12 +99,12 @@ class Walker_Nav_Menu extends Walker {
* @param int $id Current item ID. * @param int $id Current item ID.
*/ */
public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) { public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
if ( 'preserve' === $args->item_spacing ) { if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
$t = "\t";
$n = "\n";
} else {
$t = ''; $t = '';
$n = ''; $n = '';
} else {
$t = "\t";
$n = "\n";
} }
$indent = ( $depth ) ? str_repeat( $t, $depth ) : ''; $indent = ( $depth ) ? str_repeat( $t, $depth ) : '';
@ -237,12 +237,12 @@ class Walker_Nav_Menu extends Walker {
* @param stdClass $args An object of wp_nav_menu() arguments. * @param stdClass $args An object of wp_nav_menu() arguments.
*/ */
public function end_el( &$output, $item, $depth = 0, $args = array() ) { public function end_el( &$output, $item, $depth = 0, $args = array() ) {
if ( 'preserve' === $args->item_spacing ) { if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
$t = "\t";
$n = "\n";
} else {
$t = ''; $t = '';
$n = ''; $n = '';
} else {
$t = "\t";
$n = "\n";
} }
$output .= "</li>{$n}"; $output .= "</li>{$n}";
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38574'; $wp_version = '4.7-alpha-38575';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.