<!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][13404] trunk/src: Properly declare missing properties to classes in the Members component.</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/13404">13404</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/13404","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>espellcaste</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-01-09 00:24:49 +0000 (Mon, 09 Jan 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'>Properly declare missing properties to classes in the Members component.
See <a href="http://buddypress.trac.wordpress.org/ticket/7018">#7018</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityclassesclassbpactivityfeedphp">trunk/src/bp-activity/classes/class-bp-activity-feed.php</a></li>
<li><a href="#trunksrcbpactivityclassesclassbpactivitytemplatephp">trunk/src/bp-activity/classes/class-bp-activity-template.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpmembersadminphp">trunk/src/bp-members/classes/class-bp-members-admin.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpmemberscomponentphp">trunk/src/bp-members/classes/class-bp-members-component.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivityclassesclassbpactivityfeedphp"></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-feed.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-feed.php 2023-01-08 23:25:50 UTC (rev 13403)
+++ trunk/src/bp-activity/classes/class-bp-activity-feed.php 2023-01-09 00:24:49 UTC (rev 13404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $key Property to check.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether or not data variable exists.
</span><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 __isset( $key ) { return isset( $this->data[$key] ); }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __isset( $key ) {
+ return isset( $this->data[ $key ] );
+ }
</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"> * Magic method for getting a certain data variable.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +69,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $key Property to get.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Data in variable if available or null.
</span><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 __get( $key ) { return isset( $this->data[$key] ) ? $this->data[$key] : null; }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __get( $key ) {
+ return isset( $this->data[ $key ] ) ? $this->data[ $key ] : null;
+ }
</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"> * Magic method for setting a certain data variable.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +81,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $key The property to set.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The value to set.
</span><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 __set( $key, $value ) { $this->data[$key] = $value; }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __set( $key, $value ) {
+ $this->data[ $key ] = $value;
+ }
</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"> * Constructor.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +212,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_comments' => 'stream',
</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">-
</del><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="trunksrcbpactivityclassesclassbpactivitytemplatephp"></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-template.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-template.php 2023-01-08 23:25:50 UTC (rev 13403)
+++ trunk/src/bp-activity/classes/class-bp-activity-template.php 2023-01-09 00:24:49 UTC (rev 13404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,6 +108,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $full_name;
</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">+ * Check if post/comment replies are disabled.
+ *
+ * @since 1.0.0
+ * @var bool
+ */
+ public $disable_blogforum_replies;
+
+ /**
+ * If more items are available.
+ *
+ * @since 1.0.0
+ * @var bool
+ */
+ public $has_more_items;
+
+ /**
+ * An array of the logged in user's favorite activities.
+ *
+ * @since 1.0.0
+ * @var array
+ */
+ public $my_favs;
+
+ /**
+ * An array of parent activities.
+ *
+ * @since 1.0.0
+ * @var array
+ */
+ public $activity_parents;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Constructor method.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The arguments passed to this class constructor are of the same
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,8 +169,6 @@
</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"> public function __construct( $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp = buddypress();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $function_args = func_get_args();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Backward compatibility with old method of passing arguments.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +313,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $activity_parents['activities'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $activity_parents['activities'] as $parent ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->activity_parents[$parent->id] = $parent;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->activity_parents[ $parent->id ] = $parent;
</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"> unset( $activity_parents );
</span></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpmembersadminphp"></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-admin.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-admin.php 2023-01-08 23:25:50 UTC (rev 13403)
+++ trunk/src/bp-members/classes/class-bp-members-admin.php 2023-01-09 00:24:49 UTC (rev 13404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,34 +54,158 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Other *****************************************************************/
</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">+ * Redirect.
+ *
+ * @since 2.0.0
+ * @var string
+ */
+ public $redirect;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Screen id for edit user's profile page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> * @var string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $user_page = '';
</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">- * Setup BP Members Admin.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * User capability.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var string
+ */
+ public $capability;
+
+ /**
+ * Show Profile Screen id.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return BP_Members_Admin
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.0.0
+ * @var string
</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 static function register_members_admin() {
- if ( ! is_admin() ) {
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $user_profile;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp = buddypress();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Current user ID.
+ *
+ * @since 2.0.0
+ * @var int
+ */
+ public $current_user_id;
</ins><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( $bp->members->admin ) ) {
- $bp->members->admin = new self;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * User ID being edited.
+ *
+ * @since 2.0.0
+ * @var int
+ */
+ public $user_id = 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">- return $bp->members->admin;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Is a member editing their own profile.
+ *
+ * @since 2.0.0
+ * @var bool
+ */
+ public $is_self_profile = false;
</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">+ * The screen ids to load specific css for.
+ *
+ * @since 2.0.0
+ * @var array
+ */
+ public $screen_id = array();
+
+ /**
+ * The stats metabox default position.
+ *
+ * @since 2.0.0
+ * @var stdClass
+ */
+ public $stats_metabox;
+
+ /**
+ * Edit user's profile args.
+ *
+ * @since 2.0.0
+ * @var array
+ */
+ public $edit_profile_args;
+
+ /**
+ * Edit user's profile URL.
+ *
+ * @since 2.0.0
+ * @var string
+ */
+ public $edit_profile_url = '';
+
+ /**
+ * Edit URL.
+ *
+ * @since 2.0.0
+ * @var string
+ */
+ public $edit_url = '';
+
+ /**
+ * Users page.
+ *
+ * @since 2.0.0
+ * @var string
+ */
+ public $users_page = '';
+
+ /**
+ * Signups page.
+ *
+ * @since 2.0.0
+ * @var string
+ */
+ public $signups_page = '';
+
+ /**
+ * Users URL.
+ *
+ * @since 2.0.0
+ * @var string
+ */
+ public $users_url;
+
+ /**
+ * Users screen.
+ *
+ * @since 2.0.0
+ * @var string
+ */
+ public $users_screen;
+
+ /**
+ * Members' Invite Page.
+ *
+ * @since 2.0.0
+ * @var string
+ */
+ public $members_invites_page = '';
+
+ /**
+ * Status of BuddyPress network.
+ *
+ * @since 2.0.0
+ * @var bool
+ */
+ public $subsite_activated;
+
+ /**
+ * Tools menu.
+ *
+ * @since 2.0.0
+ * @var string
+ */
+ public $tools_parent = 'tools.php';
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Constructor method.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,8 +224,8 @@
</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"> // Paths and URLs
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->admin_dir = trailingslashit( $bp->plugin_dir . 'bp-members/admin' ); // Admin path.
- $this->admin_url = trailingslashit( $bp->plugin_url . 'bp-members/admin' ); // Admin URL.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->admin_dir = trailingslashit( $bp->plugin_dir . 'bp-members/admin' ); // Admin path.
+ $this->admin_url = trailingslashit( $bp->plugin_url . 'bp-members/admin' ); // Admin URL.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->css_url = trailingslashit( $this->admin_url . 'css' ); // Admin CSS URL.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->js_url = trailingslashit( $this->admin_url . 'js' ); // Admin CSS URL.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,9 +232,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Capability depends on config.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->capability = bp_core_do_network_admin() ? 'manage_network_users' : 'edit_users';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The Edit Profile Screen id.
- $this->user_page = '';
-
</del><span class="cx" style="display: block; padding: 0 10px"> // The Show Profile Screen id.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->user_profile = is_network_admin() ? 'users' : 'profile';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,31 +238,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // The current user id.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->current_user_id = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The user id being edited.
- $this->user_id = 0;
-
- // Is a member editing their own profile.
- $this->is_self_profile = false;
-
- // The screen ids to load specific css for.
- $this->screen_id = array();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // The stats metabox default position.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->stats_metabox = new StdClass();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->stats_metabox = new stdClass();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // BuddyPress edit user's profile args.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->edit_profile_args = array( 'page' => 'bp-profile-edit' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->edit_profile_url = '';
- $this->edit_url = '';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Data specific to signups.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->users_page = '';
- $this->signups_page = '';
</del><span class="cx" style="display: block; padding: 0 10px"> $this->users_url = bp_get_admin_url( 'users.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->users_screen = bp_core_do_network_admin() ? 'users-network' : 'users';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->members_invites_page = '';
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Specific config: BuddyPress is not network activated.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->subsite_activated = (bool) is_multisite() && ! bp_is_network_activated();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,8 +262,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && bp_core_do_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->tools_parent = 'network-tools';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $this->tools_parent = 'tools.php';
</del><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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,8 +272,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function setup_actions() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** Extended Profile *************************************************
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** Extended Profile **************************************************/
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Enqueue all admin JS and CSS.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,6 +410,27 @@
</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">+ * Setup BP Members Admin.
+ *
+ * @since 2.0.0
+ *
+ * @return BP_Members_Admin|null
+ */
+ public static function register_members_admin() {
+ if ( ! is_admin() ) {
+ return null;
+ }
+
+ $bp = buddypress();
+
+ if ( empty( $bp->members->admin ) ) {
+ $bp->members->admin = new self;
+ }
+
+ return $bp->members->admin;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get the user ID.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Look for $_GET['user_id']. If anything else, force the user ID to the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +579,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Create the /user/ admin Profile submenus for all members.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function user_profile_menu() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,7 +615,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Create the All Users / Profile > Edit Profile and All Users Signups submenus.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function admin_menus() {
</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 2023-01-08 23:25:50 UTC (rev 13403)
+++ trunk/src/bp-members/classes/class-bp-members-component.php 2023-01-09 00:24:49 UTC (rev 13404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +52,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $nav;
</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">+ * Member admin.
+ *
+ * @since 2.0.0
+ * @var BP_Members_Admin
+ */
+ public $admin;
+
+ /**
+ * Invitations.
+ *
+ * @var stdClass
+ */
+ public $invitations;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Start the members component creation process.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span></span></pre>
</div>
</div>
</body>
</html>