<!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>[14104] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php: Forums: Navigation: Add "Log in" link to local nav</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="http://meta.trac.wordpress.org/changeset/14104">14104</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/14104","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ryelle</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-10-10 15:43:26 +0000 (Thu, 10 Oct 2024)</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'>Forums: Navigation: Add "Log in" link to local nav
Fixes https://github.com/WordPress/wordpress.org/issues/227, closes https://github.com/WordPress/wordpress.org/pull/394, See https://github.com/WordPress/wporg-mu-plugins/issues/647.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupport2024functionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupport2024functionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php 2024-10-09 22:22:13 UTC (rev 14103)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support-2024/functions.php 2024-10-10 15:43:26 UTC (rev 14104)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,56 +54,72 @@
</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"> if ( substr( get_locale(), 0, 2 ) === 'en' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array(
- 'forums' => array(
- array(
- 'label' => __( 'Welcome to Support', 'wporg-forums' ),
- 'url' => '/welcome/',
- ),
- array(
- 'label' => __( 'Guidelines', 'wporg-forums' ),
- 'url' => '/guidelines/',
- ),
- array(
- 'label' => __( 'Get Involved', 'wporg-forums' ),
- 'url' => 'https://make.wordpress.org/support/handbook/contributing-to-the-wordpress-forums/',
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu = array(
+ array(
+ 'label' => __( 'Welcome to Support', 'wporg-forums' ),
+ 'url' => '/welcome/',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array(
+ 'label' => __( 'Guidelines', 'wporg-forums' ),
+ 'url' => '/guidelines/',
+ ),
+ array(
+ 'label' => __( 'Get involved', 'wporg-forums' ),
+ 'url' => 'https://make.wordpress.org/support/handbook/contributing-to-the-wordpress-forums/',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $local_nav_menu_object = wporg_support_get_local_nav_menu_object();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_items_fallback = array(
- 'forums' => array(
- array(
- 'label' => __( 'Get Involved', 'wporg-forums' ),
- 'url' => 'https://make.wordpress.org/support/handbook/contributing-to-the-wordpress-forums/',
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu = array(
+ array(
+ 'label' => __( 'Get involved', 'wporg-forums' ),
+ 'url' => 'https://make.wordpress.org/support/handbook/contributing-to-the-wordpress-forums/',
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_user_logged_in() ) {
+ global $wp;
+ $redirect_url = home_url( $wp->request );
+ $menu[] = array(
+ 'label' => __( 'Log in', 'wporg-forums' ),
+ 'url' => wp_login_url( $redirect_url ),
+ 'className' => 'has-separator',
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $local_nav_menu_object ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $menu_items_fallback;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array( 'forums' => $menu );
</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"> $menu_items = wp_get_nav_menu_items( $local_nav_menu_object->term_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $menu_items || empty( $menu_items ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $menu_items_fallback;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array( 'forums' => $menu );
</ins><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">- return array(
- 'forums' => array_map(
- function( $menu_item ) {
- return array(
- 'label' => esc_html( $menu_item->title ),
- 'url' => esc_url( $menu_item->url )
- );
- },
- // Limit local nav items to 3
- array_slice( $menu_items, 0, 3 )
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu = array_map(
+ function( $menu_item ) {
+ return array(
+ 'label' => esc_html( $menu_item->title ),
+ 'url' => esc_url( $menu_item->url )
+ );
+ },
+ // Limit local nav items to 3
+ array_slice( $menu_items, 0, 3 )
</ins><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 ( ! is_user_logged_in() ) {
+ global $wp;
+ $redirect_url = home_url( $wp->request );
+ $menu[] = array(
+ 'label' => __( 'Log in', 'wporg-forums' ),
+ 'url' => wp_login_url( $redirect_url ),
+ 'className' => 'has-separator',
+ );
+ }
+
+ return array( 'forums' => $menu );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wporg_block_navigation_menus', 'wporg_support_add_site_navigation_menus' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>