<!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>[BuddyPress][13519] trunk/src/bp-core: Make sure `bp_core_new_nav_default()` is ready for the BP Rewrites API</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://buddypress.trac.wordpress.org/changeset/13519">13519</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13519","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-07-16 15:43:26 +0000 (Sun, 16 Jul 2023)</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'>Make sure `bp_core_new_nav_default()` is ready for the BP Rewrites API
- In case plain permalinks are used, use the `$GLOBALS['wp']->query_string` to set the `buddypress()->unfiltered_uri` global.
- Do not edit sub nav links when calling `bp_core_new_nav_default()` if the URL parser is set to `'rewrites'`.
- Avoid a PHP notice if the new sub nav object misses the `slug` and/or the `link` properties.
Props corzel
See <a href="http://buddypress.trac.wordpress.org/ticket/4954">#4954</a>
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8936">#8936</a>
Closes https://github.com/buddypress/buddypress/pull/130</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorebuddybarphp">trunk/src/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunksrcbpcorebpcoretemplateloaderphp">trunk/src/bp-core/bp-core-template-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-buddybar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-buddybar.php 2023-07-16 07:28:38 UTC (rev 13518)
+++ trunk/src/bp-core/bp-core-buddybar.php 2023-07-16 15:43:26 UTC (rev 13519)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,32 +343,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_nav->slug
</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">- /**
- * Update secondary nav items:
- * - The previous default nav item needs to have its slug added to its link property.
- * - The new default nav item needs to have its slug removed from its link property.
- */
- $previous_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $parent_nav->default_subnav_slug );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only edit old & new default subnavs when using the Legacy URL parser.
+ if ( 'rewrites' !== bp_core_get_query_parser() ) {
+ /**
+ * Update secondary nav items:
+ * - The previous default nav item needs to have its slug added to its link property.
+ * - The new default nav item needs to have its slug removed from its link property.
+ */
+ $previous_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $parent_nav->default_subnav_slug );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Edit the link of the previous default nav item.
- $bp->members->nav->edit_nav(
- array(
- 'link' => trailingslashit( $previous_default_subnav->link . $previous_default_subnav->slug ),
- ),
- $previous_default_subnav->slug,
- $parent_nav->slug
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Edit the link of the previous default nav item.
+ $bp->members->nav->edit_nav(
+ array(
+ 'link' => trailingslashit( $previous_default_subnav->link . $previous_default_subnav->slug ),
+ ),
+ $previous_default_subnav->slug,
+ $parent_nav->slug
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $r['subnav_slug'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $r['subnav_slug'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Edit the link of the new default nav item.
- $bp->members->nav->edit_nav(
- array(
- 'link' => rtrim( untrailingslashit( $new_default_subnav->link ), $new_default_subnav->slug ),
- ),
- $new_default_subnav->slug,
- $parent_nav->slug
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure the `$new_default_subnav` properties are set.
+ if ( isset( $new_default_subnav->link, $new_default_subnav->slug ) ) {
+ // Edit the link of the new default nav item.
+ $bp->members->nav->edit_nav(
+ array(
+ 'link' => rtrim( untrailingslashit( $new_default_subnav->link ), $new_default_subnav->slug ),
+ ),
+ $new_default_subnav->slug,
+ $parent_nav->slug
+ );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_current_component( $parent_nav->slug ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpcorebpcoretemplateloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-template-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template-loader.php 2023-07-16 07:28:38 UTC (rev 13518)
+++ trunk/src/bp-core/bp-core-template-loader.php 2023-07-16 15:43:26 UTC (rev 13519)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,7 +569,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $bp->unfiltered_uri ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp->unfiltered_uri = explode( '/', $GLOBALS['wp']->request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $unfiltered_uri = explode( '/', $GLOBALS['wp']->request );
+
+ // Make sure to set the BP unfiltered_uri global when plain links are used.
+ if ( ! bp_has_pretty_urls() ) {
+ $bp_directories = array();
+ foreach ( $bp->pages as $component_id => $page_properties ) {
+ if ( isset( $bp->{$component_id}->rewrite_ids['directory'] ) ) {
+ $bp_directories[ $bp->{$component_id}->rewrite_ids['directory'] ] = $page_properties->slug;
+ } elseif ( 'activate' === $component_id || 'register' === $component_id ) {
+ $bp_directories[ 'bp_member_' . $component_id ] = $page_properties->slug;
+ }
+ }
+
+ $url_query_chunks = bp_parse_args( $GLOBALS['wp']->query_string, array() );
+ $directory = key( $url_query_chunks );
+ if ( isset( $bp_directories[ $directory ] ) ) {
+ $url_query_chunks[ $directory ] = $bp_directories[ $directory ];
+ }
+
+ $unfiltered_uri = array_values( $url_query_chunks );
+ }
+
+ $bp->unfiltered_uri = $unfiltered_uri;
</ins><span class="cx" style="display: block; padding: 0 10px"> $bp->unfiltered_uri_offset = 0;
</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>