Changeset 10894

Timestamp:

06/22/2016 09:10:09 PM (9 years ago)

Author:

r-a-y

Message:

Activity: Move activity anchor addition from bp_get_activity_comment_permalink() to bp_get_activity_permalink().

See #7135.

Location:

trunk/src/bp-activity

Files:

• bp-activity-functions.php (modified) (1 diff)
• bp-activity-template.php (modified) (2 diffs)

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

@@ -3031 +3031 @@
     } else {
         if ( 'activity_comment' == $activity_obj->type ) {
-            $link = bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $activity_obj->item_id . '/';
+            $link = bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $activity_obj->item_id . '/#acomment-' . $activity_obj->id;
         } else {
             $link = bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $activity_obj->id . '/';

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

@@ -2421 +2421 @@
      * @since 1.8.0
      *
-     *
      * @return string $link The activity comment permalink.
      */
@@ -2427 +2426 @@
         global $activities_template;
 
-        // Check that comment exists.
+        $link = bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity );
+
+        // Used for filter below.
         $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 permalink.
-        $link = bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . $comment_link;
 
         /**