<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[38708] trunk: Toolbar: Be more strict about adding a 'View Posts' link to the toolbar.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38708">38708</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38708","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-03 08:37:27 +0000 (Mon, 03 Oct 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Toolbar: Be more strict about adding a 'View Posts' link to the toolbar.
After <a href="https://core.trac.wordpress.org/changeset/38634">[38634]</a>, this adjusts the behaviour to remove redundancy by not displaying the link if the latest posts are shown on the front page. In that scenario, the 'Visit Site' link already points to the latest posts.
Fixes <a href="https://core.trac.wordpress.org/ticket/34113">#34113</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>
<li><a href="#trunktestsphpunittestsadminbarphp">trunk/tests/phpunit/tests/adminbar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesadminbarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/admin-bar.php 2016-10-03 07:54:14 UTC (rev 38707)
+++ trunk/src/wp-includes/admin-bar.php 2016-10-03 08:37:27 UTC (rev 38708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,7 +598,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object = get_post_type_object( $current_screen->post_type ) )
</span><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object->public )
</span><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object->show_in_admin_bar )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && ( get_post_type_archive_link( $post_type_object->name ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && ( get_post_type_archive_link( $post_type_object->name ) )
+ && ! ( 'post' === $post_type_object->name && 'posts' === get_option( 'show_on_front' ) ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_node( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'archive',
</span></span></pre></div>
<a id="trunktestsphpunittestsadminbarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/adminbar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/adminbar.php 2016-10-03 07:54:14 UTC (rev 38707)
+++ trunk/tests/phpunit/tests/adminbar.php 2016-10-03 08:37:27 UTC (rev 38708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,7 +383,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34113
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_admin_bar_contains_view_archive_link() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_admin_bar_has_no_archives_link_if_no_static_front_page() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'edit-post' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar = $this->get_standard_admin_bar();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,13 +391,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'front' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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();
+ $node = $wp_admin_bar->get_node( 'archive' );
+
+ set_current_screen( 'front' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotNull( $node );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34113
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_admin_bar_has_no_archives_link_for_post_types_without_archive() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_admin_bar_has_no_archives_link_for_pages() {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( 'edit-page' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar = $this->get_standard_admin_bar();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,4 +487,67 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( 'tabindex', $wp_logo_node->meta );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotNull( $about_node );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @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 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>