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

Timestamp:

12/16/2009 09:38:39 AM (16 years ago)

Author:

apeatling

Message:

Added admin option to enable/disable activity comments on blog and forum threads. Moved the "View Thread" link into a more prominent position. Fixed some activity stream spacing issues.

File:

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

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

@@ -343 +343 @@
     }
 
-    if ( !bp_is_activity_permalink() ) {
-        if ( 'activity_comment' == $activities_template->activity->component_action )
-            $meta = '</span> <span class="activity-header-meta"> &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activities_template->activity->item_id . '">' . __( 'View Thread', 'buddypress' ) . '</a>';
-        else
-            $meta = '</span> <span class="activity-header-meta"> &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activities_template->activity->id . '">' . __( 'View Thread', 'buddypress' ) . '</a>';
-    }
-
     /* Add the delete link if the user has permission on this item */
     if ( ( $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() )
@@ -497 +490 @@
 
         return apply_filters( 'bp_get_activity_permalink_id', $bp->current_action );
+    }
+
+function bp_activity_thread_permalink() {
+    echo bp_get_activity_thread_permalink();
+}
+    function bp_get_activity_thread_permalink() {
+        global $bp, $activities_template;
+
+        if ( 'new_blog_post' == bp_get_activity_action_name() || 'new_blog_comment' == bp_get_activity_action_name() || 'new_forum_topic' == bp_get_activity_action_name() || 'new_forum_post' == bp_get_activity_action_name() )
+            $link = bp_activity_feed_item_link();
+        else {
+            if ( 'activity_comment' == bp_get_activity_action_name() )
+                $link = $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activities_template->activity->item_id;
+            else
+                $link = $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activities_template->activity->id;
+        }
+
+        return apply_filters( 'bp_get_activity_thread_permalink', $link );
     }
 
@@ -514 +525 @@
         ) );
 
-        $mini_class = '';
+        $class = '';
         if ( in_array( $activities_template->activity->component_action, (array)$mini_activity_actions ) )
-            $mini_class = ' mini';
-
-        return apply_filters( 'bp_get_activity_css_class', $activities_template->activity->component_name . ' ' . $activities_template->activity->component_action . $mini_class );
+            $class = ' mini';
+
+        if ( bp_activity_get_comment_count() && bp_activity_can_comment() )
+            $class .= ' has-comments';
+
+        return apply_filters( 'bp_get_activity_css_class', $activities_template->activity->component_name . ' ' . $activities_template->activity->component_action . $class );
     }
 
@@ -616 +630 @@
     }
 
+function bp_activity_can_comment() {
+    global $bp;
+
+    if ( false === get_site_option( 'bp-disable-blogforum-comments' ) || (int)get_site_option( 'bp-disable-blogforum-comments' ) ) {
+        if ( 'new_blog_post' == bp_get_activity_action_name() || 'new_blog_comment' == bp_get_activity_action_name() || 'new_forum_topic' == bp_get_activity_action_name() || 'new_forum_post' == bp_get_activity_action_name() )
+            return false;
+    }
+
+    if ( 'activity_comment' == bp_get_activity_action_name() )
+        return false;
+
+    return true;
+}
+
 function bp_sitewide_activity_feed_link() {
     echo bp_get_sitewide_activity_feed_link();