Changeset 2077 for trunk/bp-activity.php

Timestamp:

11/02/2009 07:54:21 PM (16 years ago)

Author:

apeatling

Message:

Merging 1.1 branch changes and syncing.

File:

• trunk/bp-activity.php (modified) (21 diffs)

trunk/bp-activity.php

@@ -14 +14 @@
 /* Include deprecated functions if settings allow */
 if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-activity/deprecated/bp-activity-deprecated.php' );   
-    
+    require ( BP_PLUGIN_DIR . '/bp-activity/deprecated/bp-activity-deprecated.php' );
+
 function bp_activity_install() {
     global $wpdb, $bp;
-    
+
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-    
+
     $sql[] = "CREATE TABLE {$bp->activity->table_name} (
                 id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -41 +41 @@
     require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
     dbDelta($sql);
-    
+
     /* Drop the old sitewide and user activity tables */
     $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->base_prefix}bp_activity_user_activity" );
     $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->base_prefix}bp_activity_sitewide" );
-    
+
     /* TODO: Rename the old user activity cached table */
     //$wpdb->query( "RENAME TABLE {$wpdb->base_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
@@ -57 +57 @@
     /* Internal identifier */
     $bp->activity->id = 'activity';
-    
+
     $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity_user_activity_cached';
     $bp->activity->slug = BP_ACTIVITY_SLUG;
-        
+
     /* Register this in the active components array */
     $bp->active_components[$bp->activity->slug] = $bp->activity->id;
-    
+
     do_action( 'bp_activity_setup_globals' );
 }
@@ -69 +69 @@
 add_action( 'admin_menu', 'bp_activity_setup_globals', 2 );
 
-function bp_activity_check_installed() {    
+function bp_activity_check_installed() {
     global $wpdb, $bp;
-    
+
     if ( get_site_option('bp-activity-db-version') < BP_ACTIVITY_DB_VERSION )
         bp_activity_install();
@@ -100 +100 @@
         } else {
             $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
-            $bp->bp_options_title = $bp->displayed_user->fullname; 
+            $bp->bp_options_title = $bp->displayed_user->fullname;
         }
     }
@@ -120 +120 @@
 function bp_activity_screen_my_activity() {
     do_action( 'bp_activity_screen_my_activity' );
-    bp_core_load_template( apply_filters( 'bp_activity_template_my_activity', 'activity/just-me' ) );   
+    bp_core_load_template( apply_filters( 'bp_activity_template_my_activity', 'activity/just-me' ) );
 }
 
 function bp_activity_screen_friends_activity() {
     do_action( 'bp_activity_screen_friends_activity' );
-    bp_core_load_template( apply_filters( 'bp_activity_template_friends_activity', 'activity/my-friends' ) );   
+    bp_core_load_template( apply_filters( 'bp_activity_template_friends_activity', 'activity/my-friends' ) );
 }
 
@@ -148 +148 @@
     /* Check the nonce */
     check_admin_referer( 'bp_activity_delete_link' );
-    
+
     $activity_id = $bp->action_variables[0];
-    
+
     /* Check access */
     if ( !is_site_admin() ) {
         $activity = new BP_Activity_Activity( $activity_id );
-        
+
         if ( $activity->user_id != $bp->loggedin_user->id )
             return false;
     }
-    
+
     /* Now delete the activity item */
     if ( bp_activity_delete_by_activity_id( $activity_id ) )
@@ -164 +164 @@
     else
         bp_core_add_message( __( 'There was an error when deleting that activity', 'buddypress' ), 'error' );
-        
+
     do_action( 'bp_activity_action_delete_activity', $activity_id );
-    
+
     bp_core_redirect( $_SERVER['HTTP_REFERER'] );
 }
@@ -187 +187 @@
 
 function bp_activity_action_personal_feed() {
-    global $bp, $wp_query;  
+    global $bp, $wp_query;
 
     if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'feed' )
         return false;
-    
+
     $wp_query->is_404 = false;
     status_header( 200 );
@@ -206 +206 @@
         return false;
 
-    $wp_query->is_404 = false;  
+    $wp_query->is_404 = false;
     status_header( 200 );
 
     include_once( 'bp-activity/feeds/bp-activity-friends-feed.php' );
-    die;    
+    die;
 }
 add_action( 'wp', 'bp_activity_action_friends_feed', 3 );
@@ -226 +226 @@
 function bp_activity_add( $args = '' ) {
     global $bp, $wpdb;
-    
+
     $defaults = array(
         'content' => false, // The content of the activity item
@@ -232 +232 @@
         '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
-        
+
         '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.
         'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id, or wire_post_id
@@ -242 +242 @@
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
-    
+
     /* Insert the "time-since" placeholder */
     if ( $content )
@@ -257 +257 @@
     $activity->date_recorded = $recorded_time;
     $activity->hide_sitewide = $hide_sitewide;
-    
+
     if ( !$activity->save() )
         return false;
 
     do_action( 'bp_activity_add', $args );
-    
+
     return true;
 }
@@ -296 +296 @@
     do_action( 'bp_activity_delete_by_activity_id', $activity_id );
 
-    return true;    
+    return true;
 }
 
@@ -316 +316 @@
 
     do_action( 'bp_activity_delete_for_user_by_component', $user_id, $component_name );
-    
+
     return true;
 }
@@ -322 +322 @@
 function bp_activity_add_timesince_placeholder( $content ) {
     /* Check a time-since span doesn't already exist */
-    if ( false === strpos( $content, '<span class="time-since">' ) ) {      
+    if ( false === strpos( $content, '<span class="time-since">' ) ) {
         if ( !$pos = strpos( $content, '<blockquote' ) ) {
             if ( !$pos = strpos( $content, '<div' ) ) {
@@ -331 +331 @@
         }
     }
-    
+
     if ( (int) $pos ) {
         $before = substr( $content, 0, (int) $pos );
         $after = substr( $content, (int) $pos, strlen( $content ) );
-        
+
         $content = $before . ' <span class="time-since">%s</span>' . $after;
     }
@@ -342 +342 @@
 }
 
-function bp_activity_set_action( $component_id, $key, $value ) { 
-    global $bp; 
-
-    if ( empty( $component_id ) || empty( $key ) || empty( $value ) ) 
-        return false; 
-
-    $bp->activity->actions->{$component_id}->{$key} = apply_filters( 'bp_activity_set_action', array( 
-        'key' => $key, 
-        'value' => $value 
-    ), $component_id, $key, $value ); 
-} 
-
-function bp_activity_get_action( $component_id, $key ) { 
-    global $bp; 
-
-    if ( empty( $component_id ) || empty( $key ) ) 
-        return false; 
-
-    return apply_filters( 'bp_activity_get_action', $bp->activity->actions->{$component_id}->{$key}, $component_id, $key ); 
-} 
+function bp_activity_set_action( $component_id, $key, $value ) {
+    global $bp;
+
+    if ( empty( $component_id ) || empty( $key ) || empty( $value ) )
+        return false;
+
+    $bp->activity->actions->{$component_id}->{$key} = apply_filters( 'bp_activity_set_action', array(
+        'key' => $key,
+        'value' => $value
+    ), $component_id, $key, $value );
+}
+
+function bp_activity_get_action( $component_id, $key ) {
+    global $bp;
+
+    if ( empty( $component_id ) || empty( $key ) )
+        return false;
+
+    return apply_filters( 'bp_activity_get_action', $bp->activity->actions->{$component_id}->{$key}, $component_id, $key );
+}
 
 function bp_activity_check_exists_by_content( $content ) {
@@ -389 +389 @@
     // Clear the user's activity from the sitewide stream and clear their activity tables
     BP_Activity_Activity::delete_for_user( $user_id );
-    
+
     do_action( 'bp_activity_remove_data', $user_id );
 }
@@ -398 +398 @@
 /* Ordering function - don't call this directly */
 function bp_activity_order_by_date( $a, $b ) {
-    return apply_filters( 'bp_activity_order_by_date', strcasecmp( $b['date_recorded'], $a['date_recorded'] ) );    
+    return apply_filters( 'bp_activity_order_by_date', strcasecmp( $b['date_recorded'], $a['date_recorded'] ) );
 }