Changeset 6326

Timestamp:

02/26/2017 08:46:22 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Engagements/BuddyPress: Finish integration, and clean-up favorites & subscriptions support.

See #3068.

Location:

trunk/src/includes/extend/buddypress

Files:

• loader.php (modified) (3 diffs)
• members.php (modified) (3 diffs)

trunk/src/includes/extend/buddypress/loader.php

@@ -278 +278 @@
                 $my_topics_link        = bbp_get_user_topics_created_url( $user_id );
                 $my_replies_link       = bbp_get_user_replies_created_url( $user_id );
+                $my_engagements_link   = bbp_get_user_engagements_url( $user_id );
                 $my_favorites_link     = bbp_get_favorites_permalink( $user_id );
                 $my_subscriptions_link = bbp_get_subscriptions_permalink( $user_id );
@@ -289 +290 @@
                 $my_topics_link        = trailingslashit( $forums_link . bbp_get_topic_archive_slug() );
                 $my_replies_link       = trailingslashit( $forums_link . bbp_get_reply_archive_slug() );
+                $my_engagements_link   = trailingslashit( $forums_link . bbp_get_user_engagements_slug() );
                 $my_favorites_link     = trailingslashit( $forums_link . bbp_get_user_favorites_slug() );
                 $my_subscriptions_link = trailingslashit( $forums_link . bbp_get_user_subscriptions_slug() );
@@ -317 +319 @@
             );
 
+            // Engagements
+            if ( bbp_is_engagements_active() ) {
+                $wp_admin_nav[] = array(
+                    'parent' => 'my-account-' . $this->id,
+                    'id'     => 'my-account-' . $this->id . '-engagements',
+                    'title'  => __( 'Engagements', 'bbpress' ),
+                    'href'   => $my_engagements_link
+                );
+            }
+
             // Favorites
-            $wp_admin_nav[] = array(
-                'parent' => 'my-account-' . $this->id,
-                'id'     => 'my-account-' . $this->id . '-favorites',
-                'title'  => __( 'Favorite Topics', 'bbpress' ),
-                'href'   => $my_favorites_link
-            );
+            if ( bbp_is_favorites_active() ) {
+                $wp_admin_nav[] = array(
+                    'parent' => 'my-account-' . $this->id,
+                    'id'     => 'my-account-' . $this->id . '-favorites',
+                    'title'  => __( 'Favorite Topics', 'bbpress' ),
+                    'href'   => $my_favorites_link
+                );
+            }
 
             // Subscriptions
-            $wp_admin_nav[] = array(
-                'parent' => 'my-account-' . $this->id,
-                'id'     => 'my-account-' . $this->id . '-subscriptions',
-                'title'  => __( 'Subscribed Topics', 'bbpress' ),
-                'href'   => $my_subscriptions_link
-            );
+            if ( bbp_is_subscriptions_active() ) {
+                $wp_admin_nav[] = array(
+                    'parent' => 'my-account-' . $this->id,
+                    'id'     => 'my-account-' . $this->id . '-subscriptions',
+                    'title'  => __( 'Subscribed Topics', 'bbpress' ),
+                    'href'   => $my_subscriptions_link
+                );
+            }
         }
 

trunk/src/includes/extend/buddypress/members.php

@@ -69 +69 @@
      */
     private function setup_filters() {
-        add_filter( 'bbp_pre_get_user_profile_url',    array( $this, 'user_profile_url'            )        );
-        add_filter( 'bbp_get_favorites_permalink',     array( $this, 'get_favorites_permalink'     ), 10, 2 );
-        add_filter( 'bbp_get_subscriptions_permalink', array( $this, 'get_subscriptions_permalink' ), 10, 2 );
+        add_filter( 'bbp_pre_get_user_profile_url',     array( $this, 'user_profile_url'            )        );
+        add_filter( 'bbp_pre_get_user_engagements_url', array( $this, 'get_engagements_permalink'   )        );
+        add_filter( 'bbp_get_favorites_permalink',      array( $this, 'get_favorites_permalink'     ), 10, 2 );
+        add_filter( 'bbp_get_subscriptions_permalink',  array( $this, 'get_subscriptions_permalink' ), 10, 2 );
     }
 
@@ -180 +181 @@
      * @return string
      */
-    public function get_engagements_permalink( $url, $user_id ) {
+    public function get_engagements_permalink( $user_id ) {
 
         // Do not filter if not on BuddyPress root blog
@@ -217 +218 @@
         } elseif ( bbp_is_subscriptions_active() && bp_is_current_action( bbp_get_user_subscriptions_slug() ) ) {
             $wp_query->bbp_is_single_user_subs = true;
+
+        // 'engagements' action
+        } elseif ( bbp_is_engagements_active() && bp_is_current_action( bbp_get_user_engagements_slug() ) ) {
+            $wp_query->bbp_is_single_user_engagements = true;
         }
     }