Changeset 38575

Timestamp:

09/08/2016 07:05:32 AM (10 years ago)

Author:

peterwilsoncc

Message:

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.

File:

• trunk/src/wp-includes/class-walker-nav-menu.php (modified) (4 diffs)

trunk/src/wp-includes/class-walker-nav-menu.php

@@ -51 +51 @@
          */
         public function start_lvl( &$output, $depth = 0, $args = array() ) {
-                if ( 'preserve' === $args->item_spacing ) {
-                        $t = "\t";
-                        $n = "\n";
-                } else {
-                        $t = '';
-                        $n = '';
+                if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
+                        $t = '';
+                        $n = '';
+                } else {
+                        $t = "\t";
+                        $n = "\n";
                 }
                 $indent = str_repeat( $t, $depth );
@@ -74 +74 @@
          */
         public function end_lvl( &$output, $depth = 0, $args = array() ) {
-                if ( 'preserve' === $args->item_spacing ) {
-                        $t = "\t";
-                        $n = "\n";
-                } else {
-                        $t = '';
-                        $n = '';
+                if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
+                        $t = '';
+                        $n = '';
+                } else {
+                        $t = "\t";
+                        $n = "\n";
                 }
                 $indent = str_repeat( $t, $depth );
@@ -100 +100 @@
          */
         public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
-                if ( 'preserve' === $args->item_spacing ) {
-                        $t = "\t";
-                        $n = "\n";
-                } else {
-                        $t = '';
-                        $n = '';
+                if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
+                        $t = '';
+                        $n = '';
+                } else {
+                        $t = "\t";
+                        $n = "\n";
                 }
                 $indent = ( $depth ) ? str_repeat( $t, $depth ) : '';
@@ -238 +238 @@
          */
         public function end_el( &$output, $item, $depth = 0, $args = array() ) {
-                if ( 'preserve' === $args->item_spacing ) {
-                        $t = "\t";
-                        $n = "\n";
-                } else {
-                        $t = '';
-                        $n = '';
+                if ( isset( $args->item_spacing ) && 'discard' === $args->item_spacing ) {
+                        $t = '';
+                        $n = '';
+                } else {
+                        $t = "\t";
+                        $n = "\n";
                 }
                 $output .= "</li>{$n}";