<!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][12559] trunk: Move Avatars & Cover from xProfile to Members component : step 6</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/12559">12559</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/12559","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>2020-02-29 16:09:19 +0000 (Sat, 29 Feb 2020)</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'>Move Avatars & Cover from xProfile to Members component : step 6
Move the Avatars & Cover navigation and the Avatars REST Controllers from the xProfile Component to the Members one.
See <a href="http://buddypress.trac.wordpress.org/ticket/8156">#8156</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersclassesclassbpmemberscomponentphp">trunk/src/bp-members/classes/class-bp-members-component.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilecomponentphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php</a></li>
<li><a href="#trunktestsphpunittestcasescoreclassbpcomponentphp">trunk/tests/phpunit/testcases/core/class-bp-component.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2020-02-29 16:02:35 UTC (rev 12558)
+++ trunk/src/bp-members/classes/class-bp-members-component.php 2020-02-29 16:09:19 UTC (rev 12559)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,6 +106,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Members - User main nav screen.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_user() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require $this->path . 'bp-members/screens/profile.php';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Action - Delete avatar.
+ if ( is_user_logged_in()&& bp_is_user_change_avatar() && bp_is_action_variable( 'delete-avatar', 0 ) ) {
+ require $this->path . 'bp-members/actions/delete-avatar.php';
+ }
+
+ // Sub-nav items.
+ if ( is_user_logged_in() &&
+ in_array( bp_current_action(), array( 'change-avatar', 'change-cover-image' ), true )
+ ) {
+ require $this->path . 'bp-members/screens/' . bp_current_action() . '.php';
+ }
</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"> // Members - Theme compatibility.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,6 +301,49 @@
</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">+ * Get the Avatar and Cover image subnavs.
+ *
+ * @since 6.0.0
+ *
+ * @return array The Avatar and Cover image subnavs.
+ */
+ public function get_avatar_cover_image_subnavs() {
+ $subnavs = array();
+
+ $access = bp_core_can_edit_settings();
+ $slug = bp_get_profile_slug();
+ $profile_link = bp_get_members_component_link( $slug );
+
+ // Change Avatar.
+ if ( buddypress()->avatar->show_avatars ) {
+ $subnavs[] = array(
+ 'name' => _x( 'Change Profile Photo', 'Profile header sub menu', 'buddypress' ),
+ 'slug' => 'change-avatar',
+ 'parent_url' => $profile_link,
+ 'parent_slug' => $slug,
+ 'screen_function' => 'bp_members_screen_change_avatar',
+ 'position' => 30,
+ 'user_has_access' => $access
+ );
+ }
+
+ // Change Cover image.
+ if ( bp_displayed_user_use_cover_image_header() ) {
+ $subnavs[] = array(
+ 'name' => _x( 'Change Cover Image', 'Profile header sub menu', 'buddypress' ),
+ 'slug' => 'change-cover-image',
+ 'parent_url' => $profile_link,
+ 'parent_slug' => $slug,
+ 'screen_function' => 'bp_members_screen_change_cover_image',
+ 'position' => 40,
+ 'user_has_access' => $access
+ );
+ }
+
+ return $subnavs;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Set up fall-back component navigation if XProfile is inactive.
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,6 +366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if XProfile component is active and there's no custom front page for the user.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_displayed_user_has_front_template() && $is_xprofile_active ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'bp_xprofile_setup_nav', array( $this, 'setup_xprofile_nav' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -339,6 +395,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'default_subnav_slug' => 'public',
</span><span class="cx" style="display: block; padding: 0 10px"> 'item_css_id' => buddypress()->profile->id
</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 xProfile component is active.
+ *
+ * We need to make sure the Change Avatar and Change Cover Image subnavs are
+ * added just like it was the case before.
+ */
+ } else {
+ add_action( 'bp_xprofile_setup_nav', array( $this, 'setup_xprofile_nav' ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,7 +458,11 @@
</span><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"> $main_nav = $this->main_nav;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sub_nav[] = $this->sub_nav;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sub_nav = array( $this->sub_nav );
+
+ if ( ! $is_xprofile_active ) {
+ $sub_nav = array_merge( $sub_nav, $this->get_avatar_cover_image_subnavs() );
+ }
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,9 +486,132 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the sub nav item.
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_new_subnav_item( $this->sub_nav, 'members' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Get the Avatar and cover image subnavs.
+ $this->setup_xprofile_nav();
</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">+ * Set up the xProfile nav.
+ *
+ * @since 6.0.0
+ */
+ public function setup_xprofile_nav() {
+ // Get the Avatar and cover image subnavs.
+ $items = $this->get_avatar_cover_image_subnavs();
+
+ foreach ( $items as $item ) {
+ bp_core_new_subnav_item( $item, 'members' );
+ }
+ }
+
+ /**
+ * Get the Avatar and Cover image admin navs.
+ *
+ * @since 6.0.0
+ *
+ * @param string $admin_bar_menu_id The Admin bar menu ID to attach sub items to.
+ * @return array The Avatar and Cover image admin navs.
+ */
+ public function get_avatar_cover_image_admin_navs( $admin_bar_menu_id = '' ) {
+ $wp_admin_nav = array();
+ $profile_link = trailingslashit( bp_loggedin_user_domain() . bp_get_profile_slug() );
+
+ if ( ! $admin_bar_menu_id ) {
+ $admin_bar_menu_id = $this->id;
+ }
+
+ // Edit Avatar.
+ if ( buddypress()->avatar->show_avatars ) {
+ $wp_admin_nav[] = array(
+ 'parent' => 'my-account-' . $admin_bar_menu_id,
+ 'id' => 'my-account-' . $admin_bar_menu_id . '-change-avatar',
+ 'title' => _x( 'Change Profile Photo', 'My Account Profile sub nav', 'buddypress' ),
+ 'href' => trailingslashit( $profile_link . 'change-avatar' ),
+ 'position' => 30
+ );
+ }
+
+ // Edit Cover Image
+ if ( bp_displayed_user_use_cover_image_header() ) {
+ $wp_admin_nav[] = array(
+ 'parent' => 'my-account-' . $admin_bar_menu_id,
+ 'id' => 'my-account-' . $admin_bar_menu_id . '-change-cover-image',
+ 'title' => _x( 'Change Cover Image', 'My Account Profile sub nav', 'buddypress' ),
+ 'href' => trailingslashit( $profile_link . 'change-cover-image' ),
+ 'position' => 40
+ );
+ }
+
+ return $wp_admin_nav;
+ }
+
+ /**
+ * Set up the Admin Bar.
+ *
+ * @since 6.0.0
+ *
+ * @param array $wp_admin_nav Admin Bar items.
+ */
+ public function setup_admin_bar( $wp_admin_nav = array() ) {
+ // Menus for logged in user.
+ if ( is_user_logged_in() ) {
+ $profile_link = trailingslashit( bp_loggedin_user_domain() . bp_get_profile_slug() );
+
+ if ( ! bp_is_active( 'xprofile' ) ) {
+ // Add the "Profile" sub menu.
+ $wp_admin_nav[] = array(
+ 'parent' => buddypress()->my_account_menu_id,
+ 'id' => 'my-account-' . $this->id,
+ 'title' => _x( 'Profile', 'My Account Profile', 'buddypress' ),
+ 'href' => $profile_link
+ );
+
+ // View Profile.
+ $wp_admin_nav[] = array(
+ 'parent' => 'my-account-' . $this->id,
+ 'id' => 'my-account-' . $this->id . '-public',
+ 'title' => _x( 'View', 'My Account Profile sub nav', 'buddypress' ),
+ 'href' => $profile_link,
+ 'position' => 10
+ );
+
+ $wp_admin_nav = array_merge( $wp_admin_nav, $this->get_avatar_cover_image_admin_navs() );
+
+ /**
+ * The xProfile is active.
+ *
+ * Add the Change Avatar and Change Cover Image Admin Bar items
+ * to the xProfile Admin Bar Menu.
+ */
+ } else {
+ add_filter( 'bp_xprofile_admin_nav', array( $this, 'setup_xprofile_admin_nav' ), 2 );
+ }
+ }
+
+ parent::setup_admin_bar( $wp_admin_nav );
+ }
+
+ /**
+ * Adds "Profile > Change Avatar" & "Profile > Change Cover Image" subnav item
+ * under the "Profile" adminbar menu.
+ *
+ * @since 6.0.0
+ *
+ * @param array $wp_admin_nav The Profile adminbar nav array.
+ * @return array
+ */
+ public function setup_xprofile_admin_nav( $wp_admin_nav ) {
+ $items = $this->get_avatar_cover_image_admin_navs( buddypress()->profile->id );
+
+ if ( $items ) {
+ $wp_admin_nav = array_merge( $wp_admin_nav, $items );
+ }
+
+ return $wp_admin_nav;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Set up the title for pages and <title>.
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,6 +665,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_REST_Components_Endpoint',
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_REST_Members_Endpoint',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'BP_REST_Attachments_Member_Avatar_Endpoint',
</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="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 2020-02-29 16:02:35 UTC (rev 12558)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php 2020-02-29 16:09:19 UTC (rev 12559)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,16 +112,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_profile_component() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require $this->path . 'bp-xprofile/screens/public.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Action - Delete avatar.
- if ( is_user_logged_in()&& bp_is_user_change_avatar() && bp_is_action_variable( 'delete-avatar', 0 ) ) {
- require $this->path . 'bp-xprofile/actions/delete-avatar.php';
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Sub-nav items.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_user_logged_in() &&
- in_array( bp_current_action(), array( 'edit', 'change-avatar', 'change-cover-image' ), true )
- ) {
- require $this->path . 'bp-xprofile/screens/' . bp_current_action() . '.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_user_logged_in() && 'edit' === bp_current_action() ) {
+ require $this->path . 'bp-xprofile/screens/edit.php';
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,32 +271,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_has_access' => $access
</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">- // Change Avatar.
- if ( buddypress()->avatar->show_avatars ) {
- $sub_nav[] = array(
- 'name' => _x( 'Change Profile Photo', 'Profile header sub menu', 'buddypress' ),
- 'slug' => 'change-avatar',
- 'parent_url' => $profile_link,
- 'parent_slug' => $slug,
- 'screen_function' => 'xprofile_screen_change_avatar',
- 'position' => 30,
- 'user_has_access' => $access
- );
- }
-
- // Change Cover image.
- if ( bp_displayed_user_use_cover_image_header() ) {
- $sub_nav[] = array(
- 'name' => _x( 'Change Cover Image', 'Profile header sub menu', 'buddypress' ),
- 'slug' => 'change-cover-image',
- 'parent_url' => $profile_link,
- 'parent_slug' => $slug,
- 'screen_function' => 'xprofile_screen_change_cover_image',
- 'position' => 40,
- 'user_has_access' => $access
- );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // The Settings > Profile nav item can only be set up after
</span><span class="cx" style="display: block; padding: 0 10px"> // the Settings component has run its own nav routine.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_settings_setup_nav', array( $this, 'setup_settings_nav' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -387,27 +354,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => trailingslashit( $profile_link . 'edit' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'position' => 20
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Edit Avatar.
- if ( buddypress()->avatar->show_avatars ) {
- $wp_admin_nav[] = array(
- 'parent' => 'my-account-' . $this->id,
- 'id' => 'my-account-' . $this->id . '-change-avatar',
- 'title' => _x( 'Change Profile Photo', 'My Account Profile sub nav', 'buddypress' ),
- 'href' => trailingslashit( $profile_link . 'change-avatar' ),
- 'position' => 30
- );
- }
-
- if ( bp_displayed_user_use_cover_image_header() ) {
- $wp_admin_nav[] = array(
- 'parent' => 'my-account-' . $this->id,
- 'id' => 'my-account-' . $this->id . '-change-cover-image',
- 'title' => _x( 'Change Cover Image', 'My Account Profile sub nav', 'buddypress' ),
- 'href' => trailingslashit( $profile_link . 'change-cover-image' ),
- 'position' => 40
- );
- }
</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"> parent::setup_admin_bar( $wp_admin_nav );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,7 +449,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_REST_XProfile_Fields_Endpoint',
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_REST_XProfile_Field_Groups_Endpoint',
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_REST_XProfile_Data_Endpoint',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'BP_REST_Attachments_Member_Avatar_Endpoint',
</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="trunktestsphpunittestcasescoreclassbpcomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/class-bp-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/class-bp-component.php 2020-02-29 16:02:35 UTC (rev 12558)
+++ trunk/tests/phpunit/testcases/core/class-bp-component.php 2020-02-29 16:09:19 UTC (rev 12559)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $bp->unit_test_rest->controllers, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_REST_Components_Endpoint',
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_REST_Members_Endpoint',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'BP_REST_Attachments_Member_Avatar_Endpoint',
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,6 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $bp->unit_test_rest->controllers, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_REST_Components_Endpoint',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'BP_REST_Attachments_Member_Avatar_Endpoint',
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,6 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $bp->unit_test_rest->controllers, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_REST_Components_Endpoint',
</span><span class="cx" style="display: block; padding: 0 10px"> 'BP_REST_Members_Endpoint',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'BP_REST_Attachments_Member_Avatar_Endpoint',
</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>