<!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>[52158] trunk/src: Editor: Fix how the Site Editor is linked to</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/52158">52158</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/52158","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>noisysocks</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-11-15 03:42:08 +0000 (Mon, 15 Nov 2021)</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'>Editor: Fix how the Site Editor is linked to
- Add 'Edit site' to the top admin bar.
- Link to the Template and Template Part CPTs.
- Add deep link to the Global Styles UI.
Follows <a href="https://core.trac.wordpress.org/changeset/52069">[52069]</a>.
See <a href="https://core.trac.wordpress.org/ticket/54337">#54337</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>
<li><a href="#trunksrcwpincludesclasswpadminbarphp">trunk/src/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu.php 2021-11-15 01:08:35 UTC (rev 52157)
+++ trunk/src/wp-admin/menu.php 2021-11-15 03:42:08 UTC (rev 52158)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,6 +212,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_theme_options',
</span><span class="cx" style="display: block; padding: 0 10px"> 'site-editor.php',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $submenu['themes.php'][7] = array(
+ __( 'Styles' ),
+ 'edit_theme_options',
+ 'site-editor.php?styles=open',
+ );
</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"> // Hide Customize link on block themes unless a plugin or theme is using
</span></span></pre></div>
<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 2021-11-15 01:08:35 UTC (rev 52157)
+++ trunk/src/wp-includes/admin-bar.php 2021-11-15 03:42:08 UTC (rev 52158)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,6 +409,33 @@
</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">+ * Adds the "Edit site" link to the Toolbar.
+ *
+ * @since 5.9.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
+ */
+function wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
+ // Don't show if a block theme is not activated.
+ if ( ! wp_is_block_template_theme() ) {
+ return;
+ }
+
+ // Don't show for users who can't edit theme options or when in the admin.
+ if ( ! current_user_can( 'edit_theme_options' ) || is_admin() ) {
+ return;
+ }
+
+ $wp_admin_bar->add_node(
+ array(
+ 'id' => 'site-editor',
+ 'title' => __( 'Edit site' ),
+ 'href' => admin_url( 'site-editor.php' ),
+ )
+ );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Adds the "Customize" link to the Toolbar.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,6 +446,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_admin_bar_customize_menu( $wp_admin_bar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_customize;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't show if a block theme is activated.
+ if ( wp_is_block_template_theme() ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Don't show for users who can't access the customizer or when in the admin.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'customize' ) || is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,11 +463,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Don't show if a block theme is activated.
- if ( wp_is_block_template_theme() ) {
- return;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_customize_preview() && $wp_customize->changeset_uuid() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_url = remove_query_arg( 'customize_changeset_uuid', $current_url );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpadminbarphp"></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-admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-admin-bar.php 2021-11-15 01:08:35 UTC (rev 52157)
+++ trunk/src/wp-includes/class-wp-admin-bar.php 2021-11-15 03:42:08 UTC (rev 52158)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,6 +642,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'admin_bar_menu', 'wp_admin_bar_edit_site_menu', 40 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2021-11-15 01:08:35 UTC (rev 52157)
+++ trunk/src/wp-includes/post.php 2021-11-15 03:42:08 UTC (rev 52158)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'new_item' => __( 'New Template' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_item' => __( 'Edit Template' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'view_item' => __( 'View Template' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'all_items' => __( 'All Templates' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'all_items' => __( 'Templates' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'search_items' => __( 'Search Templates' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_item_colon' => __( 'Parent Template:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'not_found' => __( 'No templates found.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,8 +356,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'show_ui' => false,
- 'show_in_menu' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'show_ui' => wp_is_block_template_theme(),
+ 'show_in_menu' => 'themes.php',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_base' => 'templates',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -399,7 +399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'new_item' => __( 'New Template Part' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_item' => __( 'Edit Template Part' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'view_item' => __( 'View Template Part' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'all_items' => __( 'All Template Parts' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'all_items' => __( 'Template Parts' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'search_items' => __( 'Search Template Parts' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_item_colon' => __( 'Parent Template Part:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'not_found' => __( 'No template parts found.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,8 +415,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_archive' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'show_ui' => false,
- 'show_in_menu' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'show_ui' => wp_is_block_template_theme(),
+ 'show_in_menu' => 'themes.php',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_base' => 'template-parts',
</span></span></pre>
</div>
</div>
</body>
</html>