Changeset 1145

Timestamp:

02/25/2009 04:32:50 AM (16 years ago)

Author:

apeatling

Message:

Fixes #513

Location:

trunk

Files:

• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (2 diffs)
• bp-groups.php (modified) (13 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (1 diff)
• buddypress-theme/member-themes/buddypress-member/functions.php (modified) (2 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -279 +279 @@
 
 function bp_core_force_buddypress_stylesheet( $stylesheet ) {
-    global $bp, $is_single_group, $is_member_page;
+    global $bp, $is_member_page;
 
     $member_theme = get_site_option('active-member-theme');

trunk/bp-core/bp-core-templatetags.php

@@ -74 +74 @@
  */
 function bp_get_options_nav() {
-    global $bp, $is_single_group;
-
-    /* Only render this navigation when the logged in user is looking at one of their own pages. */
-    if ( bp_is_home() || $is_single_group ) {
+    global $bp;
+
+    /***
+     * Only render this navigation when the logged in user is looking at one of their own pages, or we are using it to display nav
+     * menus for something like a group, or event.
+     */
+    if ( bp_is_home() || $bp->is_single_item ) {
         if ( count( $bp->bp_options_nav[$bp->current_component] ) < 1 )
             return false;

trunk/bp-forums/bp-forums-templatetags.php

@@ -94 +94 @@
 function bp_has_topics( $topics_per_page = 10 ) {
     global $forum_template, $bp;
-    global $is_single_group, $group_obj;
+    global $group_obj;
     
     $forum_id = groups_get_groupmeta( $group_obj->id, 'forum_id' );
@@ -369 +369 @@
 function bp_has_topic_posts( $posts_per_page = 10 ) {
     global $topic_template, $bp;
-    global $is_single_group, $group_obj;
+    global $group_obj;
     
     $topic_id = $bp->action_variables[1];

trunk/bp-groups.php

@@ -189 +189 @@
 function groups_setup_nav() {
     global $bp, $current_blog;
-    global $group_obj, $is_single_group;
+    global $group_obj;
     
     if ( $group_id = BP_Groups_Group::group_exists($bp->current_action) ) {
+        
         /* This is a single group page. */
-        $is_single_group = true;
+        $bp->is_single_item = true;
         $group_obj = new BP_Groups_Group( $group_id );
     
@@ -228 +229 @@
     if ( $bp->current_component == $bp->groups->slug ) {
         
-        if ( bp_is_home() && !$is_single_group ) {
+        if ( bp_is_home() && !$bp->is_single_item ) {
             
             $bp->bp_options_title = __('My Groups', 'buddypress');
             
-        } else if ( !bp_is_home() && !$is_single_group ) {
+        } else if ( !bp_is_home() && !$bp->is_single_item ) {
 
             $bp->bp_options_avatar = bp_core_get_avatar( $bp->displayed_user->id, 1 );
             $bp->bp_options_title = $bp->displayed_user->fullname;
             
-        } else if ( $is_single_group ) {
+        } else if ( $bp->is_single_item ) {
             // We are viewing a single group, so set up the
             // group navigation menu using the $group_obj global.
@@ -397 +398 @@
 
 function groups_screen_group_home() {
-    global $is_single_group, $bp;
-    
-    if ( $is_single_group ) {
+    global $bp;
+    
+    if ( $bp->is_single_item ) {
         
         if ( isset($_GET['new']) ) {
@@ -416 +417 @@
 
 function groups_screen_group_forum() {
-    global $is_single_group, $bp, $group_obj;
-    
-    if ( $is_single_group ) {
+    global $bp, $group_obj;
+    
+    if ( $bp->is_single_item ) {
         $topic_id = $bp->action_variables[1];
         $forum_id = groups_get_groupmeta( $group_obj->id, 'forum_id' );
@@ -452 +453 @@
 function groups_screen_group_wire() {
     global $bp;
-    global $is_single_group, $group_obj;
+    global $group_obj;
     
     $wire_action = $bp->action_variables[0];
         
-    if ( $is_single_group ) {
+    if ( $bp->is_single_item ) {
         if ( 'post' == $wire_action && BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group_obj->id ) ) {
 
@@ -496 +497 @@
 function groups_screen_group_members() {
     global $bp;
-    global $is_single_group, $group_obj;
-    
-    if ( $is_single_group ) {
+    global $group_obj;
+    
+    if ( $bp->is_single_item ) {
         do_action( 'groups_screen_group_members', $group_obj->id );
         
@@ -507 +508 @@
 function groups_screen_group_photos() {
     global $bp;
-    global $is_single_group, $group_obj;
-    
-    if ( $is_single_group ) {
+    global $group_obj;
+    
+    if ( $bp->is_single_item ) {
         // Not implemented yet.
         bp_core_load_template( 'groups/group-home' );
@@ -517 +518 @@
 function groups_screen_group_invite() {
     global $bp;
-    global $is_single_group, $group_obj;
-    
-    if ( $is_single_group ) {
+    global $group_obj;
+    
+    if ( $bp->is_single_item ) {
         if ( isset($bp->action_variables) && 'send' == $bp->action_variables[0] ) {
             // Send the invites.
@@ -538 +539 @@
 function groups_screen_group_leave() {
     global $bp;
-    global $is_single_group, $group_obj;
-    
-    if ( $is_single_group ) {
+    global $group_obj;
+    
+    if ( $bp->is_single_item ) {
         if ( isset($bp->action_variables) && 'yes' == $bp->action_variables[0] ) {
             
@@ -923 +924 @@
 function groups_action_join_group() {
     global $bp;
-    global $is_single_group, $group_obj;    
-
-    if ( !$is_single_group || $bp->current_component != $bp->groups->slug || $bp->current_action != 'join' )
+    global $group_obj;  
+
+    if ( !$bp->is_single_item || $bp->current_component != $bp->groups->slug || $bp->current_action != 'join' )
         return false;
         
@@ -2219 +2220 @@
 
     if ( $current_component == $groups_bp->groups->slug )
-        $is_single_group = BP_Groups_Group::group_exists( $current_action, $groups_bp->groups->table_name );
-    
-    if ( $is_single_group ) {
+        $bp->is_single_item = BP_Groups_Group::group_exists( $current_action, $groups_bp->groups->table_name );
+    
+    if ( $bp->is_single_item ) {
         add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
         add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
@@ -2235 +2236 @@
 
 function groups_force_buddypress_stylesheet( $stylesheet ) {
-    global $bp, $is_single_group, $is_member_page, $current_component;
+    global $bp, $is_member_page, $current_component;
 
     if ( $current_component != $bp->groups->slug )
@@ -2245 +2246 @@
         $member_theme = 'buddypress-member';
     
-    if ( $is_single_group ) {
+    if ( $bp->is_single_item ) {
         add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
         add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );

trunk/bp-groups/bp-groups-templatetags.php

@@ -164 +164 @@
 function bp_has_groups( $groups_per_page = 10 ) {
     global $groups_template, $bp;
-    global $is_single_group, $group_obj;
-    
-    if ( !$is_single_group ) {
+    global $group_obj;
+    
+    if ( !$bp->is_single_item ) {
         $groups_template = new BP_Groups_Template( $bp->displayed_user->id, false, $groups_per_page );
     } else {

trunk/buddypress-theme/member-themes/buddypress-member/functions.php

@@ -9 +9 @@
 
 function bp_get_options_class() {
-    global $bp, $is_single_group;
+    global $bp;
 
     if ( !bp_is_home() && $bp->current_component == $bp->profile->slug || $bp->current_component == $bp->friends->slug  || $bp->current_component == $bp->blogs->slug ) {
@@ -15 +15 @@
     }
     
-    if ( ( $bp->current_component == $bp->groups->slug && $is_single_group ) || ( $bp->current_component == $bp->groups->slug && !bp_is_home() ) )
+    if ( ( $bp->current_component == $bp->groups->slug && $bp->is_single_item ) || ( $bp->current_component == $bp->groups->slug && !bp_is_home() ) )
         echo ' class="arrow"';  
 }