Ticket #5926: 5926.02.patch

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

@@ -2515 +2515 @@
  *
  * @since BuddyPress (1.2.0)
  *
- * @uses bp_get_root_domain()
- * @uses bp_get_activity_root_slug()
- * @uses apply_filters_ref_array() To call the 'bp_activity_get_permalink' hook.
- *
  * @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.
@@ -2547 +2543 @@
 
         if ( false !== array_search( $activity_obj->type, $use_primary_links ) ) {
                 $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 = (int) $activity_obj->item_id;
                 } else {
-                        $link = bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $activity_obj->id . '/';
+                        $id = (int) $activity_obj->id;
                 }
+
+                $link = bp_core_get_user_domain( $activity_obj->user_id ) . bp_get_activity_slug() . "/{$id}/";
         }
 
         /**
@@ -2566 +2565 @@
 }
 
 /**
+ * Get the shortlink for a single activity item.
+ *
+ * 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.3.0)
+ */
+function bp_activity_get_shortlink( $activity_id, $activity_obj = false ) {
+        $bp = buddypress();
+
+        if ( empty( $activity_obj ) ) {
+                $activity_obj = new BP_Activity_Activity( $activity_id );
+        }
+
+        if ( isset( $activity_obj->current_comment ) ) {
+                $activity_obj = $activity_obj->current_comment;
+        }
+
+        $use_primary_links = array(
+                'new_blog_post',
+                'new_blog_comment',
+                'new_forum_topic',
+                'new_forum_post',
+        );
+
+        if ( ! empty( $bp->activity->track ) ) {
+                $use_primary_links = array_merge( $use_primary_links, array_keys( $bp->activity->track ) );
+        }
+
+        if ( false !== array_search( $activity_obj->type, $use_primary_links ) ) {
+                $link = $activity_obj->primary_link;
+
+        } else {
+                if ( 'activity_comment' == $activity_obj->type ) {
+                        $id = (int) $activity_obj->item_id;
+                } else {
+                        $id = (int) $activity_obj->id;
+                }
+
+                $link = bp_get_root_domain() . '/' . bp_get_activity_root_slug() . "/p/{$id}/";
+        }
+
+        /**
+         * Filters the activity shortlink for the specified activity item.
+         *
+         * @param array $array Array holding activity shortlink and activity item object.
+         * @since BuddyPress (2.3.0)
+         */
+        return apply_filters_ref_array( 'bp_activity_get_shortlink', array( $link, &$activity_obj ) );
+}
+
+/**
  * Hide a user's activity.
  *
  * @since BuddyPress (1.2.0)

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/';
 
@@ -155 +153 @@
  *
  * @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()
@@ -189 +186 @@
 
         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/';
 
@@ -276 +273 @@
 
         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

@@ -1852 +1852 @@
                  *
                  * @since BuddyPress (1.2.0)
                  *
-                 * @param array $value Array containing the html markup for the activity permalink, after being parsed by sprintf and current activity component.
+                 * @param array $value Array containing the html markup for the activity shortlink, after being parsed by sprintf and current activity component.
                  */
-                $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 );
         }
@@ -2767 +2767 @@
         }
 
 /**
+ * Output the activity thread shortlink.
+ *
+ * @since BuddyPress (2.3.0)
+ */
+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.3.0)
+         */
+        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.0)
@@ -2814 +2836 @@
         }
 
 /**
+ * Output the activity comment shortlink.
+ *
+ * @since BuddyPress (2.3.0)
+ */
+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.3.0)
+         */
+        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;
+
+                // Append comment ID to end of activity shortlink
+                $comment_link = ! empty( $comment_id ) ? '#acomment-' . $comment_id : false;
+                $link         = bp_activity_get_shortlink( $activities_template->activity->id, $activities_template->activity );
+
+                return apply_filters( 'bp_get_activity_comment_shortlink', $link . $comment_link, $comment_id );
+        }
+
+/**
  * Output the activity favorite link.
  *
  * @since BuddyPress (1.2.0)
@@ -3104 +3155 @@
                 $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

@@ -1046 +1046 @@
         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

@@ -1085 +1085 @@
                 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>';
                 }
 
                 /**

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() );
         }