Changeset 8955

Timestamp:

08/22/2014 03:43:26 PM (12 years ago)

Author:

johnjamesjacoby

Message:

In bp_activity_can_comment_reply() check for and allow an empty $comment parameter, and set to bp_activity_current_comment() if so. This prevents debug notices and allows for cleaner comparisons in template parts.

File:

• trunk/src/bp-activity/bp-activity-template.php (modified) (7 diffs)

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

@@ -2593 +2593 @@
 
                 $url = wp_nonce_url( $url, 'bp_activity_delete_link' );
-                                
+
                 return apply_filters( 'bp_get_activity_delete_url', $url );
         }
@@ -2764 +2764 @@
         $activity_action = bp_get_activity_action_name();
         switch ( $activity_action ) {
-                
+
                 // Maybe turn off for blog and forum updates
                 case 'new_blog_post'    :
@@ -2793 +2793 @@
  *         false.
  */
-function bp_activity_can_comment_reply( $comment ) {
+function bp_activity_can_comment_reply( $comment = '' ) {
 
         // Assume activity can be commented on
         $can_comment = true;
 
-        // Fall back on current comment in activity loop
-        $comment_depth = isset( $comment->depth )
-                ? intval( $comment->depth )
-                : bp_activity_get_comment_depth();
-
-        // Threading is turned on, so check the depth
-        if ( get_option( 'thread_comments' ) ) {
-                $can_comment = (bool) ( $comment_depth < get_option( 'thread_comments_depth' ) );
-
-        // No threading for comment replies if no threading for comments
-        } else {
-                $can_comment = false;
-        }
-
-        return apply_filters( 'bp_activity_can_comment_reply', $can_comment, $comment );
+        // Check that comment exists
+        if ( empty( $comment ) ) {
+                $comment = bp_activity_current_comment();
+        }
+
+        if ( ! empty( $comment ) ) {
+
+                // Fall back on current comment in activity loop
+                $comment_depth = isset( $comment->depth )
+                        ? intval( $comment->depth )
+                        : bp_activity_get_comment_depth();
+
+                // Threading is turned on, so check the depth
+                if ( get_option( 'thread_comments' ) ) {
+                        $can_comment = (bool) ( $comment_depth < get_option( 'thread_comments_depth' ) );
+
+                // No threading for comment replies if no threading for comments
+                } else {
+                        $can_comment = false;
+                }
+        }
+
+        return (bool) apply_filters( 'bp_activity_can_comment_reply', $can_comment, $comment );
 }
 
@@ -2869 +2877 @@
                 return apply_filters( 'bp_get_total_favorite_count_for_user', $retval );
         }
-        
+
 
 /**
@@ -3189 +3197 @@
          */
         function bp_activity_recurse_comments_user_ids( array $comments = array() ) {
-                
+
                 // Default user ID's array
                 $user_ids = array();
@@ -3360 +3368 @@
                 if ( bp_is_profile_component() || bp_is_current_action( 'just-me' ) ) {
                         $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/feed/';
-                        
+
                 // Friend feed link
                 } elseif ( bp_is_active( 'friends' ) && bp_is_current_action( bp_get_friends_slug() ) ) {
                         $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/feed/';
-                        
+
                 // Group feed link
-                } elseif ( bp_is_active( 'groups'  ) && bp_is_current_action( bp_get_groups_slug()  ) ) { 
+                } elseif ( bp_is_active( 'groups'  ) && bp_is_current_action( bp_get_groups_slug()  ) ) {
                         $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/feed/';
 
@@ -3372 +3380 @@
                 } elseif ( 'favorites' === bp_current_action() ) {
                         $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/favorites/feed/';
-                        
+
                 // Mentions activity feed link
                 } elseif ( ( 'mentions' === bp_current_action() ) && bp_activity_do_mentions() ) {