Changeset 8711 for trunk/src/bp-activity/bp-activity-functions.php

Timestamp:

07/29/2014 01:28:41 PM (10 years ago)

Author:

johnjamesjacoby

Message:

A bit more clean up in bp-activity-functions.php.

File:

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

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

@@ -18 +18 @@
  * @since BuddyPress (1.5.0)
  *
- * @global object $bp BuddyPress global settings
- *
  * @return bool True if activity directory page is found, otherwise false.
  */
 function bp_activity_has_directory() {
-    global $bp;
-
-    return (bool) !empty( $bp->pages->activity->id );
+    return (bool) !empty( buddypress()->pages->activity->id );
 }
 
@@ -79 +75 @@
 
     // We've found some mentions! Check to see if users exist
-    foreach( (array) $usernames as $key => $username ) {
+    foreach( (array) array_values( $usernames ) as $username ) {
         $user_id = bp_activity_get_userid_from_mentionname( $username );
 
         // user ID exists, so let's add it to our array
         if ( ! empty( $user_id ) ) {
-            $mentioned_users[$user_id] = $username;
+            $mentioned_users[ $user_id ] = $username;
         }
     }
@@ -144 +140 @@
 
     // Increment mention count foreach mentioned user
-    foreach( (array) $usernames as $user_id => $username ) {
+    foreach( (array) array_keys( $usernames ) as $user_id ) {
         bp_activity_update_mention_count_for_user( $user_id, $activity_id, $action );
     }
@@ -1202 +1198 @@
     $activity->hide_sitewide     = $r['hide_sitewide'];
     $activity->is_spam           = $r['is_spam'];
-    $activity->action            = ! empty( $r['action'] ) ? $r['action'] : bp_activity_generate_action_string( $activity );
-
-    if ( !$activity->save() )
-        return false;
+    $activity->action            = ! empty( $r['action'] )
+                                        ? $r['action']
+                                        : bp_activity_generate_action_string( $activity );
+
+    if ( ! $activity->save() ) {
+        return false;
+    }
 
     // If this is an activity comment, rebuild the tree
-    if ( 'activity_comment' == $activity->type ) {
+    if ( 'activity_comment' === $activity->type ) {
         BP_Activity_Activity::rebuild_activity_comment_tree( $activity->item_id );
     }
@@ -1627 +1626 @@
      * @param int $comment_id The ID of the comment to be deleted.
      */
-    function bp_activity_delete_children( $activity_id, $comment_id) {
+    function bp_activity_delete_children( $activity_id, $comment_id ) {
+
+        // Get activity children to delete
+        $children = BP_Activity_Activity::get_child_comments( $comment_id );
+
         // Recursively delete all children of this comment.
-        if ( $children = BP_Activity_Activity::get_child_comments( $comment_id ) ) {
+        if ( ! empty( $children ) ) {
             foreach( (array) $children as $child ) {
                 bp_activity_delete_children( $activity_id, $child->id );
             }
         }
-        bp_activity_delete( array( 'secondary_item_id' => $comment_id, 'type' => 'activity_comment', 'item_id' => $activity_id ) );
+        
+        // Delete the comment itself
+        bp_activity_delete( array(
+            'secondary_item_id' => $comment_id,
+            'type'              => 'activity_comment',
+            'item_id'           => $activity_id
+        ) );
     }
 
@@ -1710 +1719 @@
  * @param string $link Optional. The unescaped URL that the image should link
  *        to. If absent, the image will not be a link.
- * @param array $activity_args Optional. The args passed to the activity
+ * @param array $args Optional. The args passed to the activity
  *        creation function (eg bp_blogs_record_activity()).
  * @return string $content The content with images stripped and replaced with a
@@ -1723 +1732 @@
 
     if ( !empty( $matches ) && !empty( $matches[0] ) ) {
+
         // Get the SRC value
         preg_match( '/<img.*?(src\=[\'|"]{0,1}.*?[\'|"]{0,1})[\s|>]{1}/i', $matches[0][0], $src );