Ticket #57371: 57371.patch

twentytwenty/classes/class-twentytwenty-walker-page.php

@@ -38 +38 @@
 
                         if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) {
                                 $t = "\t";
-                                $n = "\n";
                         } else {
                                 $t = '';
-                                $n = '';
                         }
                         if ( $depth ) {
                                 $indent = str_repeat( $t, $depth );

twentytwenty/inc/template-tags.php

@@ -329 +329 @@
                 // Make sure we don't output an empty container.
                 $has_meta = false;
 
-                global $post;
                 $the_post = get_post( $post_id );
                 setup_postdata( $the_post );
 
@@ -526 +525 @@
  * @param int      $current_page ID of the current page.
  * @return array CSS class names.
  */
-function twentytwenty_filter_wp_list_pages_item_classes( $css_class, $page, $depth, $args, $current_page ) {
+function twentytwenty_filter_wp_list_pages_item_classes( $css_class, $page, $depth, $args ) {
 
         // Only apply to wp_list_pages() calls with match_menu_classes set to true.
         $match_menu_classes = isset( $args['match_menu_classes'] );
@@ -561 +560 @@
  * @param int      $depth Depth of menu item. Used for padding.
  * @return stdClass An object of wp_nav_menu() arguments.
  */
-function twentytwenty_add_sub_toggles_to_main_menu( $args, $item, $depth ) {
+function twentytwenty_add_sub_toggles_to_main_menu( $args, $item ) {
 
         // Add sub menu toggles to the Expanded Menu with toggles.
         if ( isset( $args->show_toggles ) && $args->show_toggles ) {