Changeset 2471 for trunk/bp-groups.php

Timestamp:

01/28/2010 06:01:42 PM (15 years ago)

Author:

apeatling

Message:

Merged activity delete functions for better usability. Fixed some issues with the group extension API and plugin compatibility in 1.2

File:

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

trunk/bp-groups.php

@@ -107 +107 @@
 
 function groups_check_installed() {
-    global $wpdb, $bp;
-
     /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
     if ( get_site_option('bp-groups-db-version') < BP_GROUPS_DB_VERSION )
@@ -116 +114 @@
 
 function groups_setup_nav() {
-    global $bp, $current_blog, $group_obj;
+    global $bp;
 
     if ( $group_id = BP_Groups_Group::group_exists($bp->current_action) ) {
@@ -139 +137 @@
         /* Should this group be visible to the logged in user? */
         $bp->groups->current_group->is_group_visible_to_member = ( 'public' == $bp->groups->current_group->status || $is_member ) ? true : false;
-
-        /* Pre 1.1 backwards compatibility - use $bp->groups->current_group instead */
-        $group_obj = &$bp->groups->current_group;
     }
 
@@ -667 +662 @@
     global $bp;
 
-    if ( !$bp->is_single_item || $bp->current_component != $bp->groups->slug || $bp->current_action != $bp->activity->slug )
-        return false;
+    if ( $bp->current_component != $bp->groups->slug || $bp->current_action != $bp->activity->slug || empty( $bp->action_variables[0] ) )
+        return false;
+
+    $bp->is_single_item = true;
 
     bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
@@ -1244 +1241 @@
         return false;
 
-    foreach ( $bp->groups->group_creation_steps as $slug => $step )
+    foreach ( $bp->groups->group_creation_steps as $slug => $step ) {
+        while ( !empty( $temp[$step['position']] ) )
+            $step['position']++;
+
         $temp[$step['position']] = array( 'name' => $step['name'], 'slug' => $slug );
+    }
 
     /* Sort the steps by their position key */