<!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>[47763] trunk/src/wp-includes/class-wp-customize-nav-menus.php: Menus: Denote the special pages in the Customizer menu editor.</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 { white-space: pre-line; 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/47763">47763</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/47763","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-05-05 21:15:49 +0000 (Tue, 05 May 2020)</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'>Menus: Denote the special pages in the Customizer menu editor.
The special pages here are the pages that are used for the Privacy Policy, Home, and the Posts page.
Fixes <a href="https://core.trac.wordpress.org/ticket/46829">#46829</a>.
Props garrett-eclipse, audrasjb.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></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/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2020-05-05 18:56:44 UTC (rev 47762)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2020-05-05 21:15:49 UTC (rev 47763)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,16 +146,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'nav_menus_invalid_post_type' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If we're dealing with pages, let's prioritize the Front Page,
+ * Posts Page and Privacy Policy Page at the top of the list.
+ */
+ $important_pages = array();
+ $suppress_page_ids = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === $page && 'page' === $object ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add "Home" link. Treat as a page, but switch to custom on add.
- $items[] = array(
- 'id' => 'home',
- 'title' => _x( 'Home', 'nav menu home label' ),
- 'type' => 'custom',
- 'type_label' => __( 'Custom Link' ),
- 'object' => '',
- 'url' => home_url(),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Insert Front Page or custom "Home" link.
+ $front_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
+ if ( ! empty( $front_page ) ) {
+ $front_page_obj = get_post( $front_page );
+ $important_pages[] = $front_page_obj;
+ $suppress_page_ids[] = $front_page_obj->ID;
+ } else {
+ // Add "Home" link. Treat as a page, but switch to custom on add.
+ $items[] = array(
+ 'id' => 'home',
+ 'title' => _x( 'Home', 'nav menu home label' ),
+ 'type' => 'custom',
+ 'type_label' => __( 'Custom Link' ),
+ 'object' => '',
+ 'url' => home_url(),
+ );
+ }
+
+ // Insert Posts Page.
+ $posts_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_for_posts' ) : 0;
+ if ( ! empty( $posts_page ) ) {
+ $posts_page_obj = get_post( $posts_page );
+ $important_pages[] = $posts_page_obj;
+ $suppress_page_ids[] = $posts_page_obj->ID;
+ }
+
+ // Insert Privacy Policy Page.
+ $privacy_policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
+ if ( ! empty( $privacy_policy_page_id ) ) {
+ $privacy_policy_page = get_post( $privacy_policy_page_id );
+ if ( $privacy_policy_page instanceof WP_Post && 'publish' === $privacy_policy_page->post_status ) {
+ $important_pages[] = $privacy_policy_page;
+ $suppress_page_ids[] = $privacy_policy_page->ID;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'post' !== $object && 0 === $page && $post_type->has_archive ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a post type archive link.
</span><span class="cx" style="display: block; padding: 0 10px"> $items[] = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,17 +212,23 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = array(
+ 'numberposts' => 10,
+ 'offset' => 10 * $page,
+ 'orderby' => 'date',
+ 'order' => 'DESC',
+ 'post_type' => $object,
+ );
+
+ // Add suppression array to arguments for get_posts.
+ if ( ! empty( $suppress_page_ids ) ) {
+ $args['post__not_in'] = $suppress_page_ids;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $posts,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_posts(
- array(
- 'numberposts' => 10,
- 'offset' => 10 * $page,
- 'orderby' => 'date',
- 'order' => 'DESC',
- 'post_type' => $object,
- )
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $important_pages,
+ get_posts( $args )
</ins><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"> foreach ( $posts as $post ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,11 +237,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %d: ID of a post. */
</span><span class="cx" style="display: block; padding: 0 10px"> $post_title = sprintf( __( '#%d (no title)' ), $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $post_type_label = get_post_type_object( $post->post_type )->labels->singular_name;
+ $post_states = get_post_states( $post );
+ if ( ! empty( $post_states ) ) {
+ $post_type_label = implode( ',', $post_states );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $items[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => "post-{$post->ID}",
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type_label' => $post_type_label,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object' => $post->post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => intval( $post->ID ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => get_permalink( intval( $post->ID ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,6 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'pad_counts' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $terms;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,11 +398,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %d: ID of a post. */
</span><span class="cx" style="display: block; padding: 0 10px"> $post_title = sprintf( __( '#%d (no title)' ), $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $post_type_label = $post_type_objects[ $post->post_type ]->labels->singular_name;
+ $post_states = get_post_states( $post );
+ if ( ! empty( $post_states ) ) {
+ $post_type_label = implode( ',', $post_states );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $items[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'post-' . $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type_label' => $post_type_label,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'object' => $post->post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object_id' => intval( $post->ID ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => get_permalink( intval( $post->ID ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,17 +445,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add "Home" link if search term matches. Treat as a page, but switch to custom on add.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['s'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = _x( 'Home', 'nav menu home label' );
- $matches = function_exists( 'mb_stripos' ) ? false !== mb_stripos( $title, $args['s'] ) : false !== stripos( $title, $args['s'] );
- if ( $matches ) {
- $items[] = array(
- 'id' => 'home',
- 'title' => $title,
- 'type' => 'custom',
- 'type_label' => __( 'Custom Link' ),
- 'object' => '',
- 'url' => home_url(),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only insert custom "Home" link if there's no Front Page
+ $front_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
+ if ( empty( $front_page ) ) {
+ $title = _x( 'Home', 'nav menu home label' );
+ $matches = function_exists( 'mb_stripos' ) ? false !== mb_stripos( $title, $args['s'] ) : false !== stripos( $title, $args['s'] );
+ if ( $matches ) {
+ $items[] = array(
+ 'id' => 'home',
+ 'title' => $title,
+ 'type' => 'custom',
+ 'type_label' => __( 'Custom Link' ),
+ 'object' => '',
+ 'url' => home_url(),
+ );
+ }
</ins><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></pre>
</div>
</div>
</body>
</html>