Changeset 9457

Timestamp:

02/09/2015 08:20:22 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Clean up the feed section of bp-groups-template.php.

• Brackets
• PHPDoc blocks
• Add section separator

File:

• trunk/src/bp-groups/bp-groups-template.php (modified) (4 diffs)

trunk/src/bp-groups/bp-groups-template.php

@@ -4627 +4627 @@
         }
 
-/***
- * Groups RSS Feed Template Tags
- */
+/** Group RSS *****************************************************************/
 
 /**
@@ -4637 +4635 @@
  */
 function bp_groups_activity_feed() {
-        if ( !bp_is_active( 'groups' ) || !bp_is_active( 'activity' ) || !bp_is_group() )
-                return; ?>
+
+        // Bail if not viewing a single group or activity is not active
+        if ( ! bp_is_active( 'groups' ) || ! bp_is_active( 'activity' ) || ! bp_is_group() ) {
+                return;
+        } ?>
 
         <link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> | <?php bp_current_group_name() ?> | <?php _e( 'Group Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_group_activity_feed_link() ?>" />
@@ -4646 +4647 @@
 add_action( 'bp_head', 'bp_groups_activity_feed' );
 
+/**
+ * Output the current group activity-stream RSS url
+ *
+ * @since BuddyPress (1.5.0)
+ */
 function bp_group_activity_feed_link() {
         echo bp_get_group_activity_feed_link();
 }
+        /**
+         * Return the current group activity-stream RSS url
+         *
+         * @since BuddyPress (1.5.0)
+         * @return string
+         */
         function bp_get_group_activity_feed_link() {
-                return apply_filters( 'bp_get_group_activity_feed_link', bp_get_group_permalink( groups_get_current_group() ) . 'feed/' );
-        }
+                $current_group = groups_get_current_group();
+                $group_link    = bp_get_group_permalink( $current_group ) . 'feed';
+                $feed_link     = trailingslashit( $group_link );
+
+                return apply_filters( 'bp_get_group_activity_feed_link', $feed_link );
+        }
+
+/** Current Group *************************************************************/
 
 /**
@@ -4702 +4720 @@
  * Echoes the output of bp_get_current_group_name()
  *
+ * @since BuddyPress (1.5.0)
  */
 function bp_current_group_name() {