Changeset 2168 for trunk/bp-activity.php

Timestamp:

12/14/2009 03:24:05 PM (16 years ago)

Author:

apeatling

Message:

Committing core code support for new default theme.

Removed all deprecated code since it will be released as a separate plugin for backwards compatibility if people need it.

Removed the wire and status updates components since there is no support in the theme for these. If people still want this functionality then I'm sure there is someone in the community that could spend a bit of time and release them as plugins. I'm happy to guide.

Removed a lot of template loop duplication. There are no longer site loops and user loops (e.g. bp_has_site_groups() / bp_has_groups() ). There are now bp_has_members(), bp_has_groups(), bp_has_blogs() and you can pass a "user_id" parameter into these loops to limit results to only that user or users.

Merged activity stream functions. There are no longer functions for bp_activity_get_sitewide() / bp_activity_get_for_user() / bp_activity_get_friends_activity() instead there is simply one function: bp_activity_get() and you can pass in parameters to filter on just friends, for a single user, or anything your heart desires. Actually, filtering is extremely fine grained, so I encourage devs to check out the filter functions.

Lots of other code cleanup.

The new default theme will be committed straight after this. The original default folder will be renamed to bp-classic.

File:

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

trunk/bp-activity.php

@@ -9 +9 @@
 require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-classes.php' );
 require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-templatetags.php' );
-require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-widgets.php' );
 require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-filters.php' );
-
-/* Include deprecated functions if settings allow */
-if ( !defined( 'BP_IGNORE_DEPRECATED' ) )
-    require ( BP_PLUGIN_DIR . '/bp-activity/deprecated/bp-activity-deprecated.php' );
 
 function bp_activity_install() {
@@ -122 +117 @@
 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', 'members/single/activity' ) );
 }
 
@@ -173 +168 @@
     }
 
-    bp_core_load_template( apply_filters( 'bp_activity_template_profile_activity_permalink', 'activity/single' ) );
+    bp_core_load_template( apply_filters( 'bp_activity_template_profile_activity_permalink', 'members/single/activity/permalink' ) );
 }
 /* This screen is not attached to a nav item, so we need to add an action for it. */
@@ -307 +302 @@
  */
 
-function bp_activity_get_sitewide( $args = '' ) {
+function bp_activity_get( $args = '' ) {
     $defaults = array(
         'max' => false, // Maximum number of results to return
@@ -319 +314 @@
 
         /**
-         * Pass filters as an array:
+         * Pass filters as an array -- all filter items can be multiple values comma separated:
          * array(
          *  'user_id' => false, // user_id to filter on
@@ -334 +329 @@
     extract( $r, EXTR_SKIP );
 
-    return apply_filters( 'bp_activity_get_sitewide', BP_Activity_Activity::get_sitewide_activity( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden ), &$r );
-}
-
-function bp_activity_get_for_user( $args = '' ) {
-    global $bp;
-
-    $defaults = array(
-        'user_id' => $bp->displayed_user->id,
-        'max' => false, // Maximum number of results to return
-        'page' => 1, // page 1 without a per_page will result in no pagination.
-        'per_page' => false, // results per page
-        'sort' => 'DESC', // sort ASC or DESC
-        'display_comments' => 'stream', // false for no comments. 'stream' for within stream display, 'threaded' for below each activity item
-
-        'search_terms' => false, // Pass search terms as a string
-        'show_hidden' => false, // Show activity items that are hidden site-wide?
-
-        /* See bp_activity_get_sitewide() for filters */
-        'filter' => array()
-    );
-
-    $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
-
-    return apply_filters( 'bp_activity_get_for_user', BP_Activity_Activity::get_activity_for_user( $user_id, $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden ), &$r );
-}
-
-function bp_activity_get_friends_activity( $user_id, $max = 30, $max_items_per_friend = false, $pag_num = false, $pag_page = false, $filter = false ) {
-    return apply_filters( 'bp_activity_get_friends_activity', BP_Activity_Activity::get_activity_for_friends( $user_id, $max_items, $max_items_per_friend, $pag_num, $pag_page, $filter ), $user_id, $max_items, $max_items_per_friend, $pag_num, $pag_page, $filter );
+    return apply_filters( 'bp_activity_get', BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden ), &$r );
 }
 
@@ -537 +504 @@
 }
 
+/**
+ * bp_activity_filter_template_paths()
+ *
+ * Add fallback for the bp-sn-parent theme template locations used in BuddyPress versions
+ * older than 1.2.
+ *
+ * @package BuddyPress Core
+ */
+function bp_activity_filter_template_paths() {
+    if ( 'bp-sn-parent' != basename( TEMPLATEPATH ) && !defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+        return false;
+
+    add_filter( 'bp_activity_template_my_activity', create_function( '', 'return "activity/just-me";' ) );
+    add_filter( 'bp_activity_template_friends_activity', create_function( '', 'return "activity/my-friends";' ) );
+    add_filter( 'bp_activity_template_profile_activity_permalink', create_function( '', 'return "activity/single";' ) );
+
+    /* Activity widget should only be available to older themes since the new default has it all in the template */
+    require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-widgets.php' );
+}
+add_action( 'widgets_init', 'bp_activity_filter_template_paths' );
+
 function bp_activity_remove_data( $user_id ) {
     // Clear the user's activity from the sitewide stream and clear their activity tables
@@ -547 +535 @@
 add_action( 'make_spam_user', 'bp_activity_remove_data' );
 
-/* 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'] ) );
-}
-
 ?>