Changeset 38523 for trunk/src/wp-includes/class-walker-page.php

Timestamp:

09/06/2016 09:05:45 AM (10 years ago)

Author:

peterwilsoncc

Message:

Menus: Add white space option to wp_nav_menu() and wp_list_pages().

Adds an item_spacing option to the arguments array for the functions wp_nav_menu(), wp_list_pages(), and wp_page_menu(). item_spacing is a boolean accepting either preserve or discard.

Previously, certain CSS choices could result in a site's layout changing if wp_nav_menu() fell back to the default wp_list_pages() due to differences in the whitespace within the HTML. The new argument ensures a function outputs consistant HTML while maintaining backward compatibility.

Fixes #35206.

File:

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

trunk/src/wp-includes/class-walker-page.php

@@ -54 +54 @@
          */
         public function start_lvl( &$output, $depth = 0, $args = array() ) {
-                $indent = str_repeat("\t", $depth);
-                $output .= "\n$indent<ul class='children'>\n";
+                if ( 'preserve' === $args['item_spacing'] ) {
+                        $t = "\t";
+                        $n = "\n";
+                } else {
+                        $t = '';
+                        $n = '';
+                }
+                $indent = str_repeat( $t, $depth );
+                $output .= "{$n}{$indent}<ul class='children'>{$n}";
         }
 
@@ -72 +79 @@
          */
         public function end_lvl( &$output, $depth = 0, $args = array() ) {
-                $indent = str_repeat("\t", $depth);
-                $output .= "$indent</ul>\n";
+                if ( 'preserve' === $args['item_spacing'] ) {
+                        $t = "\t";
+                        $n = "\n";
+                } else {
+                        $t = '';
+                        $n = '';
+                }
+                $indent = str_repeat( $t, $depth );
+                $output .= "{$indent}</ul>{$n}";
         }
 
@@ -90 +104 @@
          */
         public function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) {
+                if ( 'preserve' === $args['item_spacing'] ) {
+                        $t = "\t";
+                        $n = "\n";
+                } else {
+                        $t = '';
+                        $n = '';
+                }
                 if ( $depth ) {
-                        $indent = str_repeat( "\t", $depth );
+                        $indent = str_repeat( $t, $depth );
                 } else {
                         $indent = '';
@@ -176 +197 @@
          */
         public function end_el( &$output, $page, $depth = 0, $args = array() ) {
-                $output .= "</li>\n";
+                if ( 'preserve' === $args['item_spacing'] ) {
+                        $t = "\t";
+                        $n = "\n";
+                } else {
+                        $t = '';
+                        $n = '';
+                }
+                $output .= "</li>{$n}";
         }