<!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][13087] trunk/src: Add a new method to the Members & Groups components main class</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/13087">13087</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/13087","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-22 16:47:17 +0000 (Sun, 22 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'>Add a new method to the Members & Groups components main class
`BP_Members_Component::setup_additional_globals()` & `BP_Groups_Component::setup_additional_globals()` are used to set specific components globals that are not passed to `BP_Component::setup_globals()`. This commit also makes sure the BP Nouveau template pack uses a consistent object ID for its directory navigation.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8555">#8555</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunksrcbptemplatesbpnouveaubuddypressfunctionsphp">trunk/src/bp-templates/bp-nouveau/buddypress-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-22 03:16:06 UTC (rev 13086)
+++ trunk/src/bp-groups/classes/class-bp-groups-component.php 2021-08-22 16:47:17 UTC (rev 13087)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,61 +215,13 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Set up component global data.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Set up additional globals for the component.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The BP_GROUPS_SLUG constant is deprecated, and only used here for
- * backwards compatibility.
- *
- * @since 1.5.0
- *
- * @see BP_Component::setup_globals() for a description of arguments.
- *
- * @param array $args See BP_Component::setup_globals() for a description.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 10.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function setup_globals( $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function setup_additional_globals() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Define a slug, if necessary.
- if ( ! defined( 'BP_GROUPS_SLUG' ) ) {
- define( 'BP_GROUPS_SLUG', $this->id );
- }
-
- // Global tables for groups component.
- $global_tables = array(
- 'table_name' => $bp->table_prefix . 'bp_groups',
- 'table_name_members' => $bp->table_prefix . 'bp_groups_members',
- 'table_name_groupmeta' => $bp->table_prefix . 'bp_groups_groupmeta'
- );
-
- // Metadata tables for groups component.
- $meta_tables = array(
- 'group' => $bp->table_prefix . 'bp_groups_groupmeta',
- );
-
- // Fetch the default directory title.
- $default_directory_titles = bp_core_get_directory_page_default_titles();
- $default_directory_title = $default_directory_titles[$this->id];
-
- // All globals for groups component.
- // Note that global_tables is included in this array.
- $args = array(
- 'slug' => BP_GROUPS_SLUG,
- 'root_slug' => isset( $bp->pages->groups->slug ) ? $bp->pages->groups->slug : BP_GROUPS_SLUG,
- 'has_directory' => true,
- 'directory_title' => isset( $bp->pages->groups->title ) ? $bp->pages->groups->title : $default_directory_title,
- 'notification_callback' => 'groups_format_notifications',
- 'search_string' => _x( 'Search Groups...', 'Component directory search', 'buddypress' ),
- 'global_tables' => $global_tables,
- 'meta_tables' => $meta_tables,
- 'block_globals' => array(
- 'bp/dynamic-groups' => array(
- 'widget_classnames' => array( 'widget_bp_groups_widget', 'buddypress' ),
- ),
- ),
- );
-
- parent::setup_globals( $args );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* Single Group Globals **********************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Are we viewing a single group?
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,6 +396,66 @@
</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">+ * Set up component global data.
+ *
+ * The BP_GROUPS_SLUG constant is deprecated, and only used here for
+ * backwards compatibility.
+ *
+ * @since 1.5.0
+ *
+ * @see BP_Component::setup_globals() for a description of arguments.
+ *
+ * @param array $args See BP_Component::setup_globals() for a description.
+ */
+ public function setup_globals( $args = array() ) {
+ $bp = buddypress();
+
+ // Define a slug, if necessary.
+ if ( ! defined( 'BP_GROUPS_SLUG' ) ) {
+ define( 'BP_GROUPS_SLUG', $this->id );
+ }
+
+ // Global tables for groups component.
+ $global_tables = array(
+ 'table_name' => $bp->table_prefix . 'bp_groups',
+ 'table_name_members' => $bp->table_prefix . 'bp_groups_members',
+ 'table_name_groupmeta' => $bp->table_prefix . 'bp_groups_groupmeta'
+ );
+
+ // Metadata tables for groups component.
+ $meta_tables = array(
+ 'group' => $bp->table_prefix . 'bp_groups_groupmeta',
+ );
+
+ // Fetch the default directory title.
+ $default_directory_titles = bp_core_get_directory_page_default_titles();
+ $default_directory_title = $default_directory_titles[$this->id];
+
+ // All globals for groups component.
+ // Note that global_tables is included in this array.
+ $args = array(
+ 'slug' => BP_GROUPS_SLUG,
+ 'root_slug' => isset( $bp->pages->groups->slug ) ? $bp->pages->groups->slug : BP_GROUPS_SLUG,
+ 'has_directory' => true,
+ 'directory_title' => isset( $bp->pages->groups->title ) ? $bp->pages->groups->title : $default_directory_title,
+ 'notification_callback' => 'groups_format_notifications',
+ 'search_string' => _x( 'Search Groups...', 'Component directory search', 'buddypress' ),
+ 'global_tables' => $global_tables,
+ 'meta_tables' => $meta_tables,
+ 'block_globals' => array(
+ 'bp/dynamic-groups' => array(
+ 'widget_classnames' => array( 'widget_bp_groups_widget', 'buddypress' ),
+ ),
+ ),
+ );
+
+ parent::setup_globals( $args );
+
+ // Additional globals.
+ $this->setup_additional_globals();
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Set up canonical stack for this component.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</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-22 03:16:06 UTC (rev 13086)
+++ trunk/src/bp-members/classes/class-bp-members-component.php 2021-08-22 16:47:17 UTC (rev 13087)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,6 +155,71 @@
</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">+ * Set up additional globals for the component.
+ *
+ * @since 10.0.0
+ */
+ public function setup_additional_globals() {
+ $bp = buddypress();
+
+ /** Logged in user ***************************************************
+ */
+
+ // The core userdata of the user who is currently logged in.
+ $bp->loggedin_user->userdata = bp_core_get_core_userdata( bp_loggedin_user_id() );
+
+ // Fetch the full name for the logged in user.
+ $bp->loggedin_user->fullname = isset( $bp->loggedin_user->userdata->display_name ) ? $bp->loggedin_user->userdata->display_name : '';
+
+ // Hits the DB on single WP installs so get this separately.
+ $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = is_super_admin( bp_loggedin_user_id() );
+
+ // The domain for the user currently logged in. eg: http://example.com/members/andy.
+ $bp->loggedin_user->domain = bp_core_get_user_domain( bp_loggedin_user_id() );
+
+ /** Displayed user ***************************************************
+ */
+
+ // The core userdata of the user who is currently being displayed.
+ $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
+
+ // Fetch the full name displayed user.
+ $bp->displayed_user->fullname = isset( $bp->displayed_user->userdata->display_name ) ? $bp->displayed_user->userdata->display_name : '';
+
+ // The domain for the user currently being displayed.
+ $bp->displayed_user->domain = bp_core_get_user_domain( bp_displayed_user_id() );
+
+ // If A user is displayed, check if there is a front template
+ if ( bp_get_displayed_user() ) {
+ $bp->displayed_user->front_template = bp_displayed_user_get_front_template();
+ }
+
+ /** Initialize the nav for the members component *********************
+ */
+
+ $this->nav = new BP_Core_Nav();
+
+ /** Signup ***********************************************************
+ */
+
+ $bp->signup = new stdClass;
+
+ /** Profiles Fallback ************************************************
+ */
+
+ if ( ! bp_is_active( 'xprofile' ) ) {
+ $bp->profile = new stdClass;
+ $bp->profile->slug = 'profile';
+ $bp->profile->id = 'profile';
+ }
+
+ /** Network Invitations **************************************************
+ */
+
+ $bp->members->invitations = new stdClass;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Set up bp-members global settings.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The BP_MEMBERS_SLUG constant is deprecated, and only used here for
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,59 +277,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setup_globals( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** Logged in user ***************************************************
- */
-
- // The core userdata of the user who is currently logged in.
- $bp->loggedin_user->userdata = bp_core_get_core_userdata( bp_loggedin_user_id() );
-
- // Fetch the full name for the logged in user.
- $bp->loggedin_user->fullname = isset( $bp->loggedin_user->userdata->display_name ) ? $bp->loggedin_user->userdata->display_name : '';
-
- // Hits the DB on single WP installs so get this separately.
- $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = is_super_admin( bp_loggedin_user_id() );
-
- // The domain for the user currently logged in. eg: http://example.com/members/andy.
- $bp->loggedin_user->domain = bp_core_get_user_domain( bp_loggedin_user_id() );
-
- /** Displayed user ***************************************************
- */
-
- // The core userdata of the user who is currently being displayed.
- $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
-
- // Fetch the full name displayed user.
- $bp->displayed_user->fullname = isset( $bp->displayed_user->userdata->display_name ) ? $bp->displayed_user->userdata->display_name : '';
-
- // The domain for the user currently being displayed.
- $bp->displayed_user->domain = bp_core_get_user_domain( bp_displayed_user_id() );
-
- // Initialize the nav for the members component.
- $this->nav = new BP_Core_Nav();
-
- // If A user is displayed, check if there is a front template
- if ( bp_get_displayed_user() ) {
- $bp->displayed_user->front_template = bp_displayed_user_get_front_template();
- }
-
- /** Signup ***********************************************************
- */
-
- $bp->signup = new stdClass;
-
- /** Profiles Fallback ************************************************
- */
-
- if ( ! bp_is_active( 'xprofile' ) ) {
- $bp->profile = new stdClass;
- $bp->profile->slug = 'profile';
- $bp->profile->id = 'profile';
- }
-
- /** Network Invitations **************************************************
- */
-
- $bp->members->invitations = new stdClass;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Additional globals.
+ $this->setup_additional_globals();
</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>
<a id="trunksrcbptemplatesbpnouveaubuddypressfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress-functions.php 2021-08-22 03:16:06 UTC (rev 13086)
+++ trunk/src/bp-templates/bp-nouveau/buddypress-functions.php 2021-08-22 16:47:17 UTC (rev 13087)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Functions of BuddyPress's "Nouveau" template pack.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 10.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @buddypress-template-pack {
</span><span class="cx" style="display: block; padding: 0 10px"> * Template Pack ID: nouveau
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</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"> $this->includes_dir = trailingslashit( $this->dir ) . 'includes/';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->directory_nav = new BP_Core_Nav();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->directory_nav = new BP_Core_Nav( bp_get_root_blog_id() );
</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>