Changeset 38940

Timestamp:

10/26/2016 01:57:57 AM (8 years ago)

Author:

pento

Message:

Menus: Add the menu-item-home class to the static front page item.

When a site is using a static front page, and that page is in a menu, it isn't given the CSS class menu-item-home, contrary to the developer documentation.

An incorrect solution was originally added in [35272], and is now gone. Let us never speak of it again.

Props mdgl, adamsilverstein, welcher, pento.
Fixes #35272.

Location:

trunk

Files:

• src/wp-includes/nav-menu-template.php (modified) (3 diffs)
• tests/phpunit/tests/post/nav-menu.php (modified) (1 diff)

trunk/src/wp-includes/nav-menu-template.php

@@ -335 +335 @@
 
     $front_page_url = home_url();
+    $front_page_id  = (int) get_option( 'page_on_front' );
 
     foreach ( (array) $menu_items as $key => $menu_item ) {
@@ -344 +345 @@
         $classes[] = 'menu-item-type-' . $menu_item->type;
         $classes[] = 'menu-item-object-' . $menu_item->object;
+
+        // This menu item is set as the 'Front Page'.
+        if ( 'post_type' === $menu_item->type && $front_page_id === (int) $menu_item->object_id ) {
+            $classes[] = 'menu-item-home';
+        }
 
         // if the menu item corresponds to a taxonomy term for the currently-queried non-hierarchical post object
@@ -376 +382 @@
                 $classes[] = 'page-item-' . $menu_item->object_id;
                 $classes[] = 'current_page_item';
-            }
-
-            if ( 'page_on_front' ) {
-                $classes[] = 'menu-item-home';
             }
 

trunk/tests/phpunit/tests/post/nav-menu.php

@@ -445 +445 @@
         return $ignored_1;
     }
+
+
+    /**
+     * @ticket 35272
+     */
+    function test_no_front_page_class_applied() {
+        $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'Home Page' ) );
+
+        wp_update_nav_menu_item( $this->menu_id, 0, array(
+            'menu-item-type' => 'post_type',
+            'menu-item-object' => 'page',
+            'menu-item-object-id' => $page_id,
+            'menu-item-status' => 'publish',
+        ));
+
+        $menu_items = wp_get_nav_menu_items( $this->menu_id );
+        _wp_menu_item_classes_by_context( $menu_items );
+
+        $classes = $menu_items[0]->classes;
+
+        $this->assertNotContains( 'menu-item-home', $classes );
+    }
+
+
+    /**
+     * @ticket 35272
+     */
+    function test_class_applied_to_front_page_item() {
+        $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'Home Page' ) );
+        update_option( 'page_on_front', $page_id );
+
+        wp_update_nav_menu_item( $this->menu_id, 0, array(
+            'menu-item-type' => 'post_type',
+            'menu-item-object' => 'page',
+            'menu-item-object-id' => $page_id,
+            'menu-item-status' => 'publish',
+        ));
+
+        $menu_items = wp_get_nav_menu_items( $this->menu_id );
+        _wp_menu_item_classes_by_context( $menu_items );
+
+        $classes = $menu_items[0]->classes;
+
+        delete_option( 'page_on_front' );
+
+        $this->assertContains( 'menu-item-home', $classes );
+    }
+
+    /**
+     * @ticket 35272
+     */
+    function test_class_not_applied_to_taxonomies_with_same_id_as_front_page_item() {
+        global $wpdb;
+
+        $new_id = 35272;
+
+        $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'Home Page' ) );
+        $tag_id = self::factory()->tag->create();
+
+        $wpdb->query( "UPDATE $wpdb->posts SET ID=$new_id WHERE ID=$page_id" );
+        $wpdb->query( "UPDATE $wpdb->terms SET term_id=$new_id WHERE term_id=$page_id" );
+        $wpdb->query( "UPDATE $wpdb->term_taxonomy SET term_id=$new_id WHERE term_id=$page_id" );
+
+        update_option( 'page_on_front', $new_id );
+
+        wp_update_nav_menu_item( $this->menu_id, 0, array(
+            'menu-item-type' => 'taxonomy',
+            'menu-item-object' => 'post_tag',
+            'menu-item-object-id' => $new_id,
+            'menu-item-status' => 'publish',
+        ) );
+
+        $menu_items = wp_get_nav_menu_items( $this->menu_id );
+        _wp_menu_item_classes_by_context( $menu_items );
+
+        $classes = $menu_items[0]->classes;
+
+        $this->assertNotContains( 'menu-item-home', $classes );
+    }
 }