Changeset 38708
- Timestamp:
- 10/03/2016 08:37:27 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/admin-bar.php
r38698 r38708 599 599 && ( $post_type_object->public ) 600 600 && ( $post_type_object->show_in_admin_bar ) 601 && ( get_post_type_archive_link( $post_type_object->name ) ) ) 601 && ( get_post_type_archive_link( $post_type_object->name ) ) 602 && ! ( 'post' === $post_type_object->name && 'posts' === get_option( 'show_on_front' ) ) ) 602 603 { 603 604 $wp_admin_bar->add_node( array( -
trunk/tests/phpunit/tests/adminbar.php
r38663 r38708 384 384 * @ticket 34113 385 385 */ 386 public function test_admin_bar_ contains_view_archive_link() {386 public function test_admin_bar_has_no_archives_link_if_no_static_front_page() { 387 387 set_current_screen( 'edit-post' ); 388 388 … … 392 392 set_current_screen( 'front' ); 393 393 394 $this->assertNull( $node ); 395 } 396 397 /** 398 * @ticket 34113 399 */ 400 public function test_admin_bar_contains_view_archive_link_if_static_front_page() { 401 update_option( 'show_on_front', 'page' ); 402 set_current_screen( 'edit-post' ); 403 404 $wp_admin_bar = $this->get_standard_admin_bar(); 405 $node = $wp_admin_bar->get_node( 'archive' ); 406 407 set_current_screen( 'front' ); 408 394 409 $this->assertNotNull( $node ); 395 410 } … … 398 413 * @ticket 34113 399 414 */ 400 public function test_admin_bar_has_no_archives_link_for_p ost_types_without_archive() {415 public function test_admin_bar_has_no_archives_link_for_pages() { 401 416 set_current_screen( 'edit-page' ); 402 417 … … 473 488 $this->assertNotNull( $about_node ); 474 489 } 490 491 /** 492 * @ticket 34113 493 */ 494 public function test_admin_bar_has_no_archives_link_for_non_public_cpt() { 495 register_post_type( 'foo-non-public', array( 496 'public' => false, 497 'has_archive' => true, 498 'show_in_admin_bar' => true, 499 ) ); 500 501 set_current_screen( 'edit-foo-non-public' ); 502 503 $wp_admin_bar = $this->get_standard_admin_bar(); 504 $node = $wp_admin_bar->get_node( 'archive' ); 505 506 set_current_screen( 'front' ); 507 unregister_post_type( 'foo-non-public' ); 508 509 $this->assertNull( $node ); 510 } 511 512 /** 513 * @ticket 34113 514 */ 515 public function test_admin_bar_has_no_archives_link_for_cpt_without_archive() { 516 register_post_type( 'foo-non-public', array( 517 'public' => true, 518 'has_archive' => false, 519 'show_in_admin_bar' => true, 520 ) ); 521 522 set_current_screen( 'edit-foo-non-public' ); 523 524 $wp_admin_bar = $this->get_standard_admin_bar(); 525 $node = $wp_admin_bar->get_node( 'archive' ); 526 527 set_current_screen( 'front' ); 528 unregister_post_type( 'foo-non-public' ); 529 530 $this->assertNull( $node ); 531 } 532 533 /** 534 * @ticket 34113 535 */ 536 public function test_admin_bar_has_no_archives_link_for_cpt_not_shown_in_admin_bar() { 537 register_post_type( 'foo-non-public', array( 538 'public' => true, 539 'has_archive' => true, 540 'show_in_admin_bar' => false, 541 ) ); 542 543 set_current_screen( 'edit-foo-non-public' ); 544 545 $wp_admin_bar = $this->get_standard_admin_bar(); 546 $node = $wp_admin_bar->get_node( 'archive' ); 547 548 set_current_screen( 'front' ); 549 unregister_post_type( 'foo-non-public' ); 550 551 $this->assertNull( $node ); 552 } 475 553 }
Note: See TracChangeset
for help on using the changeset viewer.