Ticket #34113: 34113.5.diff

src/wp-includes/admin-bar.php

@@ -581 +581 @@
                         && ( $post_type_object = get_post_type_object( $current_screen->post_type ) )
                         && ( $post_type_object->public )
                         && ( $post_type_object->show_in_admin_bar )
-                        && ( get_post_type_archive_link( $post_type_object->name ) ) )
+                        && ( get_post_type_archive_link( $post_type_object->name ) )
+                        && ! ( 'post' === $post_type_object->name && 'posts' === get_option( 'show_on_front' ) ) )
                 {
                         $wp_admin_bar->add_node( array(
                                 'id' => 'archive',

tests/phpunit/tests/adminbar.php

@@ -383 +383 @@
         /**
          * @ticket 34113
          */
-        public function test_admin_bar_contains_view_archive_link() {
+        public function test_admin_bar_has_no_archives_link_if_no_static_front_page() {
+                set_current_screen( 'edit-post' );
+
+                $wp_admin_bar = $this->get_standard_admin_bar();
+                $node         = $wp_admin_bar->get_node( 'archive' );
+
+                set_current_screen( 'front' );
+
+                $this->assertNull( $node );
+        }
+
+        /**
+         * @ticket 34113
+         */
+        public function test_admin_bar_contains_view_archive_link_if_static_front_page() {
+                update_option( 'show_on_front', 'page' );
                 set_current_screen( 'edit-post' );
 
                 $wp_admin_bar = $this->get_standard_admin_bar();
@@ -397 +412 @@
         /**
          * @ticket 34113
          */
-        public function test_admin_bar_has_no_archives_link_for_post_types_without_archive() {
+        public function test_admin_bar_has_no_archives_link_for_pages() {
                 set_current_screen( 'edit-page' );
 
                 $wp_admin_bar = $this->get_standard_admin_bar();
@@ -407 +422 @@
 
                 $this->assertNull( $node );
         }
+
+        /**
+         * @ticket 34113
+         */
+        public function test_admin_bar_has_no_archives_link_for_non_public_cpt() {
+                register_post_type( 'foo-non-public', array(
+                        'public'            => false,
+                        'has_archive'       => true,
+                        'show_in_admin_bar' => true,
+                ) );
+
+                set_current_screen( 'edit-foo-non-public' );
+
+                $wp_admin_bar = $this->get_standard_admin_bar();
+                $node         = $wp_admin_bar->get_node( 'archive' );
+
+                set_current_screen( 'front' );
+                unregister_post_type( 'foo-non-public' );
+
+                $this->assertNull( $node );
+        }
+
+        /**
+         * @ticket 34113
+         */
+        public function test_admin_bar_has_no_archives_link_for_cpt_without_archive() {
+                register_post_type( 'foo-non-public', array(
+                        'public'            => true,
+                        'has_archive'       => false,
+                        'show_in_admin_bar' => true,
+                ) );
+
+                set_current_screen( 'edit-foo-non-public' );
+
+                $wp_admin_bar = $this->get_standard_admin_bar();
+                $node         = $wp_admin_bar->get_node( 'archive' );
+
+                set_current_screen( 'front' );
+                unregister_post_type( 'foo-non-public' );
+
+                $this->assertNull( $node );
+        }
+
+        /**
+         * @ticket 34113
+         */
+        public function test_admin_bar_has_no_archives_link_for_cpt_not_shown_in_admin_bar() {
+                register_post_type( 'foo-non-public', array(
+                        'public'            => true,
+                        'has_archive'       => true,
+                        'show_in_admin_bar' => false,
+                ) );
+
+                set_current_screen( 'edit-foo-non-public' );
+
+                $wp_admin_bar = $this->get_standard_admin_bar();
+                $node         = $wp_admin_bar->get_node( 'archive' );
+
+                set_current_screen( 'front' );
+                unregister_post_type( 'foo-non-public' );
+
+                $this->assertNull( $node );
+        }
 }