Changeset 436 for trunk/bp-activity/bp-activity-templatetags.php

Timestamp:

10/24/2008 04:00:42 PM (18 years ago)

Author:

apeatling

Message:

• Fixed avatar upload validation bug when image upload field left blank
• Fixed incorrect "your" wording on site wide activity widget
• Fixed profile wire posting bug
• Updated site wide members directory

File:

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

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

@@ -85 +85 @@
 }
 
-function bp_activity_get_list( $user_id, $title, $limit = false ) {
-        global $bp_activity_user_id, $bp_activity_limit, $bp_activity_title;
+function bp_activity_get_list( $user_id, $title, $no_activity, $limit = false ) {
+        global $bp_activity_user_id, $bp_activity_limit, $bp_activity_title, $bp_activity_no_activity;
         
         $bp_activity_user_id = $user_id;
         $bp_activity_limit = $limit;
         $bp_activity_title = $title;
+        $bp_activity_no_activity = $no_activity;
         
         load_template( TEMPLATEPATH . '/activity/activity-list.php' );
@@ -122 +123 @@
 }
 
+function bp_activities_no_activity() {
+        global $bp_activity_no_activity;
+        echo $bp_activity_no_activity;
+}
+
 function bp_activity_content() {
         global $activities_template;
@@ -133 +139 @@
 }
 
-function bp_activity_content_filter( $content, $date_recorded, $full_name, $insert_time = true, $is_home = true ) {
+function bp_activity_content_filter( $content, $date_recorded, $full_name, $insert_time = true, $filter_words = true, $filter_you = true ) {
         if ( !$content )
                 return false;
@@ -146 +152 @@
         if ( $insert_time )
                 $content[0] = bp_activity_insert_time_since( $content[0], $date_recorded );
+
+        /* Switch 'their/your' depending on whether the user is logged in or not and viewing their profile */
+        if ( $filter_words ) {
+                $content[0] = str_replace( __('their', 'buddypress'), __('your', 'buddypress'), $content[0] );
+        }
         
-        /* Switch 'their/your' and 'Name/You' depending on whether the user is logged in or not and viewing their profile */
-        if ( $is_home ) {
-                $content[0] = str_replace( __('their', 'buddypress'), __('your', 'buddypress'), $content[0] );
-                $content[0] = str_replace( $full_name, __('You', 'buddypress'), $content[0] );          
+        /* Remove the 'You' and replace if with the persons name */
+        if ( $filter_you ) {
+                $content[0] = str_replace( $full_name, __('You', 'buddypress'), $content[0] );                          
         }
         
@@ -169 +179 @@
 
 
+
 ?>