Changeset 8717

Timestamp:

07/29/2014 02:01:59 PM (10 years ago)

Author:

johnjamesjacoby

Message:

In bp_get_activity_comment_permalink(), check that activity comment exists, and fallback on the regular activity permalink if it doesn't. Also pass $comment_id into the filter for easier tweaking.

File:

• trunk/src/bp-activity/bp-activity-template.php (modified) (1 diff)

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

@@ -2383 +2383 @@
         global $activities_template;
 
-        $link = bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . '#acomment-' . $activities_template->activity->current_comment->id;
-
-        return apply_filters( 'bp_get_activity_comment_permalink', $link );
+        // 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 permalink
+        $link = bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . $comment_link;
+
+        return apply_filters( 'bp_get_activity_comment_permalink', $link, $comment_id );
     }