Changeset 2344

Timestamp:

01/18/2010 09:18:57 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Refactor 'new_wire_post' and rename to 'activity_update' for consistency. Some AJAX filters renamed to prevent "_activity_activity_update" naming issues due to refactoring. Actual 'new_wire_post' filter type moved to backpat Wire component.

Location:

trunk

Files:

• bp-activity.php (modified) (3 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (2 diffs)
• bp-groups.php (modified) (1 diff)
• bp-themes/bp-default/activity/index.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/activity.php (modified) (1 diff)
• bp-themes/bp-default/members/single/activity.php (modified) (1 diff)
• bp-themes/bp-sn-parent/_inc/ajax.php (modified) (2 diffs)
• bp-themes/bp-sn-parent/functions.php (modified) (1 diff)

trunk/bp-activity.php

@@ -396 +396 @@
          *  'user_id' => false, // user_id to filter on
          *  'object' => false, // object to filter on e.g. groups, profile, status, friends
-         *  'action' => false, // action to filter on e.g. new_wire_post, profile_updated
+         *  'action' => false, // action to filter on e.g. activity_update, profile_updated
          *  'primary_id' => false, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
          *  'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
@@ -435 +435 @@
         'primary_link' => false, // The primary URL for this item in RSS feeds
         'component_name' => false, // The name/ID of the component e.g. groups, profile, mycomponent
-        'component_action' => false, // The component action e.g. new_wire_post, profile_updated
+        'component_action' => false, // The component action e.g. activity_update, profile_updated
 
         'user_id' => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user.
@@ -502 +502 @@
         'primary_link' => apply_filters( 'bp_activity_new_update_primary_link', $primary_link ),
         'component_name' => $bp->activity->id,
-        'component_action' => 'new_wire_post'
+        'component_action' => 'activity_update'
     ) );
 

trunk/bp-activity/bp-activity-templatetags.php

@@ -125 +125 @@
         'user_id' => false, // user_id to filter on
         'object' => false, // object to filter on e.g. groups, profile, status, friends
-        'action' => false, // action to filter on e.g. new_wire_post, new_forum_post, profile_updated
+        'action' => false, // action to filter on e.g. activity_update, new_forum_post, profile_updated
         'primary_id' => false, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
         'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
@@ -733 +733 @@
             $title = substr( $title, 0, -1 );
 
-        if ( 'new_wire_post' == $activities_template->activity->component_action ) {
+        if ( 'activity_update' == $activities_template->activity->component_action ) {
             $content = explode( '<div class="activity-inner">', $activities_template->activity->content );
             $title .= ': ' . strip_tags( bp_create_excerpt( $content[1], 15 ));

trunk/bp-groups.php

@@ -1918 +1918 @@
         'content' => apply_filters( 'groups_activity_new_update_content', $activity_content ),
         'primary_link' => apply_filters( 'groups_activity_new_update_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
-        'component_action' => 'new_wire_post',
+        'component_action' => 'activity_update',
         'item_id' => $bp->groups->current_group->id
     ) );

trunk/bp-themes/bp-default/activity/index.php

@@ -51 +51 @@
                         <select>
                             <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
-                            <option value="new_wire_post"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
+                            <option value="activity_update"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
                             <option value="new_blog_post"><?php _e( 'Show Blog Posts', 'buddypress' ) ?></option>
                             <option value="new_blog_comment"><?php _e( 'Show Blog Comments', 'buddypress' ) ?></option>

trunk/bp-themes/bp-default/groups/single/activity.php

@@ -8 +8 @@
             <select>
                 <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
-                <option value="new_wire_post"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
+                <option value="activity_update"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
                 <option value="new_forum_topic"><?php _e( 'Show New Forum Topics', 'buddypress' ) ?></option>
                 <option value="new_forum_post"><?php _e( 'Show Forum Replies', 'buddypress' ) ?></option>

trunk/bp-themes/bp-default/members/single/activity.php

@@ -10 +10 @@
             <select>
                 <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
-                <option value="new_wire_post"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
+                <option value="activity_update"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
                 <option value="new_blog_post"><?php _e( 'Show Blog Posts', 'buddypress' ) ?></option>
                 <option value="new_blog_comment"><?php _e( 'Show Blog Comments', 'buddypress' ) ?></option>

trunk/bp-themes/bp-sn-parent/_inc/ajax.php

@@ -447 +447 @@
         $activity_id = xprofile_record_activity( array(
             'user_id' => $bp->loggedin_user->id,
-            'content' => apply_filters( 'xprofile_activity_new_wire_post', $activity_content, &$wire_post ),
-            'primary_link' => apply_filters( 'xprofile_activity_new_wire_post_primary_link', $primary_link ),
-            'component_action' => 'new_wire_post'
+            'content' => apply_filters( 'xprofile_activity_update', $activity_content, &$wire_post ),
+            'primary_link' => apply_filters( 'xprofile_activity_update_primary_link', $primary_link ),
+            'component_action' => 'activity_update'
         ) );
 
-        do_action( 'xprofile_new_wire_post', &$wire_post );
+        do_action( 'xprofile_activity_update', &$wire_post );
     } else {
         $bp->groups->current_group = new BP_Groups_Group( $item_id );
@@ -462 +462 @@
 
         $activity_id = groups_record_activity( array(
-            'content' => apply_filters( 'groups_activity_new_wire_post', $activity_content ),
-            'primary_link' => apply_filters( 'groups_activity_new_wire_post_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
-            'component_action' => 'new_wire_post',
+            'content' => apply_filters( 'groups_activity_update', $activity_content ),
+            'primary_link' => apply_filters( 'groups_activity_update_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
+            'component_action' => 'activity_update',
             'item_id' => $item_id
         ) );
 
-        do_action( 'groups_new_wire_post', $item_id, $wire_post->id );
+        do_action( 'groups_activity_update', $item_id, $wire_post->id );
     }
 

trunk/bp-themes/bp-sn-parent/functions.php

@@ -163 +163 @@
                     <select>
                         <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
-                        <option value="new_wire_post"><?php _e( 'Updates Only', 'buddypress' ) ?></option>
+                        <option value="activity_update"><?php _e( 'Updates Only', 'buddypress' ) ?></option>
                         <option value="new_forum_post,new_forum_topic"><?php _e( 'Group Forum Activity Only', 'buddypress' ) ?></option>
                         <option value="new_blog_post,new_blog_comment"><?php _e( 'Blog Activity Only', 'buddypress' ) ?></option>