<!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][13093] trunk/src: Make sure `bp_core_new_nav_default()` updates the previous default 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://buddypress.trac.wordpress.org/changeset/13093">13093</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/13093","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>2021-08-25 08:13:04 +0000 (Wed, 25 Aug 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'>Make sure `bp_core_new_nav_default()` updates the previous default nav
- The previous default nav item needs to have its slug added to its link property.
- The default subnav slug needs to be added to the URL used by the corresponding `wp_admin_nav` item.
- The new default nav item needs to have its slug removed from its link property.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8471">#8471</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityclassesclassbpactivitycomponentphp">trunk/src/bp-activity/classes/class-bp-activity-component.php</a></li>
<li><a href="#trunksrcbpblogsclassesclassbpblogscomponentphp">trunk/src/bp-blogs/classes/class-bp-blogs-component.php</a></li>
<li><a href="#trunksrcbpcorebpcorebuddybarphp">trunk/src/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunksrcbpfriendsclassesclassbpfriendscomponentphp">trunk/src/bp-friends/classes/class-bp-friends-component.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupscomponentphp">trunk/src/bp-groups/classes/class-bp-groups-component.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpmemberscomponentphp">trunk/src/bp-members/classes/class-bp-members-component.php</a></li>
<li><a href="#trunksrcbpmessagesclassesclassbpmessagescomponentphp">trunk/src/bp-messages/classes/class-bp-messages-component.php</a></li>
<li><a href="#trunksrcbpnotificationsclassesclassbpnotificationscomponentphp">trunk/src/bp-notifications/classes/class-bp-notifications-component.php</a></li>
<li><a href="#trunksrcbpsettingsclassesclassbpsettingscomponentphp">trunk/src/bp-settings/classes/class-bp-settings-component.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilecomponentphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivityclassesclassbpactivitycomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/classes/class-bp-activity-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/classes/class-bp-activity-component.php 2021-08-24 04:16:17 UTC (rev 13092)
+++ trunk/src/bp-activity/classes/class-bp-activity-component.php 2021-08-25 08:13:04 UTC (rev 13093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'my-account-' . $this->id . '-personal',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => _x( 'Personal', 'My Account Activity sub nav', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $activity_link,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => trailingslashit( $activity_link . 'just-me' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => 10
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpblogsclassesclassbpblogscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/classes/class-bp-blogs-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/classes/class-bp-blogs-component.php 2021-08-24 04:16:17 UTC (rev 13092)
+++ trunk/src/bp-blogs/classes/class-bp-blogs-component.php 2021-08-25 08:13:04 UTC (rev 13093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'my-account-' . $this->id . '-my-sites',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'My Sites', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $blogs_link,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => trailingslashit( $blogs_link . 'my-sites' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => 10
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<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 2021-08-24 04:16:17 UTC (rev 13092)
+++ trunk/src/bp-core/bp-core-buddybar.php 2021-08-25 08:13:04 UTC (rev 13093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,19 +325,42 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_nav = reset( $parent_nav );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $parent_nav->screen_function ) ) {
- // Remove our screen hook if screen function is callable.
- if ( is_callable( $parent_nav->screen_function ) ) {
- remove_action( 'bp_screens', $parent_nav->screen_function, 3 );
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Edit the screen function for the parent nav.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp->members->nav->edit_nav( array(
- 'screen_function' => &$r['screen_function'],
- 'default_subnav_slug' => $r['subnav_slug'],
- ), $parent_nav->slug );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp->members->nav->edit_nav(
+ array(
+ 'screen_function' => &$r['screen_function'],
+ 'default_subnav_slug' => $r['subnav_slug'],
+ ),
+ $parent_nav->slug
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; 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 );
+
+ // 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
+ );
+
+ $new_default_subnav = $bp->members->nav->get( $parent_nav->slug . '/' . $r['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"> if ( bp_is_current_component( $parent_nav->slug ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The only way to tell whether to set the subnav is to peek at the unfiltered_uri
</span></span></pre></div>
<a id="trunksrcbpfriendsclassesclassbpfriendscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-friends/classes/class-bp-friends-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-friends/classes/class-bp-friends-component.php 2021-08-24 04:16:17 UTC (rev 13092)
+++ trunk/src/bp-friends/classes/class-bp-friends-component.php 2021-08-25 08:13:04 UTC (rev 13093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'my-account-' . $this->id . '-friendships',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => _x( 'Friendships', 'My Account Friends menu sub nav', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $friends_link,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => trailingslashit( $friends_link . 'my-friends' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-groups-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-component.php 2021-08-24 04:16:17 UTC (rev 13092)
+++ trunk/src/bp-groups/classes/class-bp-groups-component.php 2021-08-25 08:13:04 UTC (rev 13093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -843,7 +843,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'my-account-' . $this->id . '-memberships',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => _x( 'Memberships', 'My Account Groups sub nav', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $groups_link,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => trailingslashit( $groups_link . 'my-groups' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => 10
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpmemberscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-members-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-members-component.php 2021-08-24 04:16:17 UTC (rev 13092)
+++ trunk/src/bp-members/classes/class-bp-members-component.php 2021-08-25 08:13:04 UTC (rev 13093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,7 +639,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'my-account-' . $this->id . '-public',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => _x( 'View', 'My Account Profile sub nav', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $profile_link,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => trailingslashit( $profile_link . 'public' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => 10
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpmessagesclassesclassbpmessagescomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/classes/class-bp-messages-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/classes/class-bp-messages-component.php 2021-08-24 04:16:17 UTC (rev 13092)
+++ trunk/src/bp-messages/classes/class-bp-messages-component.php 2021-08-25 08:13:04 UTC (rev 13093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,7 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'my-account-' . $this->id . '-inbox',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $inbox,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $messages_link,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => trailingslashit( $messages_link . 'inbox' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => 10
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpnotificationsclassesclassbpnotificationscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-notifications/classes/class-bp-notifications-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-notifications/classes/class-bp-notifications-component.php 2021-08-24 04:16:17 UTC (rev 13092)
+++ trunk/src/bp-notifications/classes/class-bp-notifications-component.php 2021-08-25 08:13:04 UTC (rev 13093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'my-account-' . $this->id . '-unread',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $unread,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $notifications_link,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => trailingslashit( $notifications_link . 'unread' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpsettingsclassesclassbpsettingscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-settings/classes/class-bp-settings-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-settings/classes/class-bp-settings-component.php 2021-08-24 04:16:17 UTC (rev 13092)
+++ trunk/src/bp-settings/classes/class-bp-settings-component.php 2021-08-25 08:13:04 UTC (rev 13093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,7 +259,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'my-account-' . $this->id . '-general',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'General', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $settings_link,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => trailingslashit( $settings_link . 'general' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilecomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php 2021-08-24 04:16:17 UTC (rev 13092)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php 2021-08-25 08:13:04 UTC (rev 13093)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,7 +344,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => 'my-account-' . $this->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'my-account-' . $this->id . '-public',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => _x( 'View', 'My Account Profile sub nav', 'buddypress' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $profile_link,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'href' => trailingslashit( $profile_link . 'public' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'position' => 10
</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>