Ticket #5926: 5926.01.patch

src/bp-activity/bp-activity-functions.php

@@ -1703 +1703 @@
  * be sure to pass the full $activity_obj parameter as well, if you already
  * have it available.
  *
+ * @param int $activity_id The unique id of the activity object.
+ * @param object $activity_obj Optional. The activity object.
+ * @return string $link Permalink for the activity item.
  * @since BuddyPress (1.2.0)
+ */
+function bp_activity_get_permalink( $activity_id, $activity_obj = false ) {
+        if ( ! $activity_obj ) {
+                $activity_obj = new BP_Activity_Activity( $activity_id );
+        }
+
+        if ( isset( $activity_obj->current_comment ) ) {
+                $activity_obj = $activity_obj->current_comment;
+        }
+
+        if ( 'new_blog_post' == $activity_obj->type || 'new_blog_comment' == $activity_obj->type || 'new_forum_topic' == $activity_obj->type || 'new_forum_post' == $activity_obj->type ) {
+                $link = $activity_obj->primary_link;
+
+        } else {
+                if ( 'activity_comment' === $activity_obj->type ) {
+                        $id = $activity_obj->item_id;
+                } else {
+                        $id = $activity_obj->id;
+                }
+
+                $link = bp_core_get_user_domain( $activity_obj->user_id ) . bp_get_activity_slug() . "/{$id}/";
+        }
+
+        return apply_filters_ref_array( 'bp_activity_get_permalink', array( $link, &$activity_obj ) );
+}
+
+/**
+ * Get the shortlink for a single activity item.
  *
- * @uses bp_get_root_domain()
- * @uses bp_get_activity_root_slug()
- * @uses apply_filters_ref_array() To call the 'bp_activity_get_permalink' hook.
+ * When only the $activity_id param is passed, BP has to instantiate a new
+ * BP_Activity_Activity object. To save yourself some processing overhead,
+ * be sure to pass the full $activity_obj parameter as well, if you already
+ * have it available.
  *
  * @param int $activity_id The unique id of the activity object.
  * @param object $activity_obj Optional. The activity object.
  * @return string $link Permalink for the activity item.
+ * @since BuddyPress (2.2.0)
  */
-function bp_activity_get_permalink( $activity_id, $activity_obj = false ) {
-
-        if ( empty( $activity_obj ) ) {
+function bp_activity_get_shortlink( $activity_id, $activity_obj = false ) {
+        if ( ! $activity_obj ) {
                 $activity_obj = new BP_Activity_Activity( $activity_id );
         }
 
@@ -1725 +1757 @@
 
         if ( 'new_blog_post' == $activity_obj->type || 'new_blog_comment' == $activity_obj->type || 'new_forum_topic' == $activity_obj->type || 'new_forum_post' == $activity_obj->type ) {
                 $link = $activity_obj->primary_link;
+
         } else {
                 if ( 'activity_comment' == $activity_obj->type ) {
-                        $link = bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $activity_obj->item_id . '/';
+                        $id = $activity_obj->item_id;
                 } else {
-                        $link = bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $activity_obj->id . '/';
+                        $id = $activity_obj->id;
                 }
+
+                $link = bp_get_root_domain() . '/' . bp_get_activity_root_slug() . "/p/{$id}/";
         }
 
-        return apply_filters_ref_array( 'bp_activity_get_permalink', array( $link, &$activity_obj ) );
+        return apply_filters_ref_array( 'bp_activity_get_shortlink', array( $link, &$activity_obj ) );
 }
 
 /**

src/bp-activity/bp-activity-notifications.php

@@ -20 +20 @@
  * @uses bp_notifications_add_notification()
  * @uses bp_get_user_meta()
  * @uses bp_core_get_user_displayname()
- * @uses bp_activity_get_permalink()
- * @uses bp_core_get_user_domain()
  * @uses bp_get_settings_slug()
  * @uses bp_activity_filter_kses()
  * @uses bp_core_get_core_userdata()
@@ -60 +58 @@
         if ( 'no' != bp_get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
                 $poster_name = bp_core_get_user_displayname( $activity->user_id );
 
-                $message_link  = bp_activity_get_permalink( $activity_id );
+                $message_link  = bp_activity_get_shortlink( $activity_id );
                 $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
                 $settings_link = bp_core_get_user_domain( $receiver_user_id ) . $settings_slug . '/notifications/';
 
@@ -117 +115 @@
  *
  * @uses bp_get_user_meta()
  * @uses bp_core_get_user_displayname()
- * @uses bp_activity_get_permalink()
  * @uses bp_core_get_user_domain()
  * @uses bp_get_settings_slug()
  * @uses bp_activity_filter_kses()
@@ -151 +148 @@
 
         if ( $original_activity->user_id != $commenter_id && 'no' != bp_get_user_meta( $original_activity->user_id, 'notification_activity_new_reply', true ) ) {
                 $poster_name   = bp_core_get_user_displayname( $commenter_id );
-                $thread_link   = bp_activity_get_permalink( $activity_id );
+                $thread_link   = bp_activity_get_shortlink( $activity_id );
                 $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
                 $settings_link = bp_core_get_user_domain( $original_activity->user_id ) . $settings_slug . '/notifications/';
 
@@ -199 +196 @@
 
         if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != bp_get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply', true ) ) {
                 $poster_name   = bp_core_get_user_displayname( $commenter_id );
-                $thread_link   = bp_activity_get_permalink( $activity_id );
+                $thread_link   = bp_activity_get_shortlink( $activity_id );
                 $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
                 $settings_link = bp_core_get_user_domain( $parent_comment->user_id ) . $settings_slug . '/notifications/';
 

src/bp-activity/bp-activity-template.php

@@ -1649 +1649 @@
 
         // Insert the permalink
         if ( !bp_is_single_activity() )
-                $content = apply_filters_ref_array( 'bp_activity_permalink', array( sprintf( '%1$s <a href="%2$s" class="view activity-time-since" title="%3$s">%4$s</a>', $content, bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ), esc_attr__( 'View Discussion', 'buddypress' ), $time_since ), &$activities_template->activity ) );
+                $content = apply_filters_ref_array( 'bp_activity_permalink', array( sprintf( '%1$s <a href="%2$s" class="view activity-time-since" title="%3$s">%4$s</a>', $content, bp_activity_get_shortlink( $activities_template->activity->id, $activities_template->activity ), esc_attr__( 'View Discussion', 'buddypress' ), $time_since ), &$activities_template->activity ) );
         else
                 $content .= str_pad( $time_since, strlen( $time_since ) + 2, ' ', STR_PAD_BOTH );
 
@@ -2397 +2397 @@
         }
 
 /**
+ * Output the activity thread shortlink.
+ *
+ * @since BuddyPress (2.2)
+ */
+function bp_activity_thread_shortlink() {
+        echo bp_get_activity_thread_shortlink();
+}
+
+        /**
+         * Return the activity thread shortlink.
+         *
+         * @return string $link The activity thread shortlink.
+         * @since BuddyPress (2.2)
+         */
+        function bp_get_activity_thread_shortlink() {
+                global $activities_template;
+
+                $link = bp_activity_get_shortlink( $activities_template->activity->id, $activities_template->activity );
+                return apply_filters( 'bp_get_activity_thread_shortlink', $link );
+        }
+
+/**
  * Output the activity comment permalink.
  *
  * @since BuddyPress (1.8)
@@ -2436 +2458 @@
         }
 
 /**
+ * Output the activity comment shortlink.
+ *
+ * @since BuddyPress (2.2)
+ */
+function bp_activity_comment_shortlink() {
+        echo bp_get_activity_comment_shortlink();
+}
+        /**
+         * Return the activity comment shortlink.
+         *
+         * @return string $link The activity comment shortlink.
+         * @since BuddyPress (2.2)
+         */
+        function bp_get_activity_comment_shortlink() {
+                global $activities_template;
+
+                // Check that comment exists
+                $comment_id = isset( $activities_template->activity->current_comment->id )
+                        ? $activities_template->activity->current_comment->id
+                        : 0;
+
+                // Setup the comment link
+                $comment_link = ! empty( $comment_id )
+                        ? '#acomment-' .$comment_id
+                        : false;
+
+                // Append comment ID to end of activity shortlink
+                $link = bp_activity_get_shortlink( $activities_template->activity->id, $activities_template->activity ) . $comment_link;
+
+                return apply_filters( 'bp_get_activity_comment_shortlink', $link, $comment_id );
+        }
+
+/**
  * Output the activity favorite link.
  *
  * @since BuddyPress (1.2)
@@ -2675 +2730 @@
                 $latest_update = sprintf(
                         '%s <a href="%s">%s</a>',
                         $latest_update,
-                        esc_url_raw( bp_activity_get_permalink( $update['id'] ) ),
+                        esc_url_raw( bp_activity_get_shortlink( $update['id'] ) ),
                         esc_attr__( 'View', 'buddypress' )
                 );
 

src/bp-blogs/bp-blogs-activity.php

@@ -952 +952 @@
         return $retval;
 }
 add_filter( 'bp_activity_get_permalink', 'bp_blogs_activity_comment_single_permalink', 10, 2 );
+add_filter( 'bp_activity_get_shortlink', 'bp_blogs_activity_comment_single_permalink', 10, 2 );
 
 /**
  * Formats single activity comment entries to use the blog comment action.

src/bp-core/deprecated/1.5.php

@@ -339 +339 @@
                 if ( 'no' != bp_get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
                         $poster_name = bp_core_get_user_displayname( $poster_user_id );
 
-                        $message_link  = bp_activity_get_permalink( $activity_id );
+                        $message_link  = bp_activity_get_shortlink( $activity_id );
                         $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
                         $settings_link = bp_core_get_user_domain( $receiver_user_id ) . $settings_slug . '/notifications/';
 

src/bp-members/bp-members-template.php

@@ -891 +891 @@
                 if ( $view_link && ( $update_content != $update['content'] ) ) {
                         $view = __( 'View', 'buddypress' );
 
-                        $update_content .= '<span class="activity-read-more"><a href="' . bp_activity_get_permalink( $update['id'] ) . '" rel="nofollow">' . $view . '</a></span>';
+                        $update_content .= '<span class="activity-read-more"><a href="' . bp_activity_get_shortlink( $update['id'] ) . '" rel="nofollow">' . $view . '</a></span>';
                 }
 
                 return apply_filters( 'bp_get_member_latest_update', $update_content );

tests/phpunit/testcases/routing/activity.php

@@ -23 +23 @@
                 $this->assertEquals( bp_get_activity_root_slug(), bp_current_component() );
         }
 
-        /**
-         * Can't test using bp_activity_get_permalink(); see bp_activity_action_permalink_router().
-         */
         function test_activity_permalink() {
                 $a = $this->factory->activity->create();
                 $activity = $this->factory->activity->get_object_by_id( $a );
 
-                $url = bp_core_get_user_domain( $activity->user_id ) . bp_get_activity_slug() . '/' . $activity->id . '/';
-                $this->go_to( $url );
+                $this->go_to( bp_activity_get_permalink( $activity->id, $activity ) );
+                $this->assertTrue( bp_is_single_activity() );
+        }
+
+        function test_activity_shortlink() {
+                $a = $this->factory->activity->create();
+                $activity = $this->factory->activity->get_object_by_id( $a );
+
+                $this->go_to( bp_activity_get_shortlink( $activity->id, $activity ) );
                 $this->assertTrue( bp_is_single_activity() );
         }