Changeset 3472

Timestamp:

11/21/2010 11:30:57 PM (14 years ago)

Author:

boonebgorges

Message:

Fixes a whole bunch of WP_DEBUG problems with groups and especially group creation.

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (3 diffs)
• bp-groups.php (modified) (7 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (5 diffs)

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

@@ -705 +705 @@
     function bp_get_avatar_admin_step() {
         global $bp;
-
-        return apply_filters( 'bp_get_avatar_admin_step', $bp->avatar_admin->step );
+        
+        if ( isset( $bp->avatar_admin->step ) )
+            $step = $bp->avatar_admin->step;
+        else
+            $step = '';
+
+        return apply_filters( 'bp_get_avatar_admin_step', $step );
     }
 
@@ -714 +719 @@
     function bp_get_avatar_to_crop() {
         global $bp;
-
-        return apply_filters( 'bp_get_avatar_to_crop', $bp->avatar_admin->image->url );
+        
+        if ( isset( $bp->avatar_admin->image->url ) )
+            $url = $bp->avatar_admin->image->url;
+        else
+            $url = '';
+
+        return apply_filters( 'bp_get_avatar_to_crop', $url );
     }
 
@@ -1027 +1037 @@
         $options['groups'] = __( 'Groups', 'buddypress' );
 
-    if ( function_exists( 'bp_forums_is_installed_correctly' ) && bp_forums_is_installed_correctly() && !(int) $bp->site_options['bp-disable-forum-directory'] )
+    if ( function_exists( 'bp_forums_is_installed_correctly' ) && bp_forums_is_installed_correctly() && !isset( $bp->site_options['bp-disable-forum-directory'] ) )
         $options['forums'] = __( 'Forums', 'buddypress' );
 

trunk/bp-groups.php

@@ -97 +97 @@
             /* When in a single group, the first action is bumped down one because of the
                group name, so we need to adjust this and set the group name to current_item. */
-            $bp->current_item = $bp->current_action;
-            $bp->current_action = $bp->action_variables[0];
+            $bp->current_item = isset( $bp->current_action ) ? $bp->current_action : false;
+            $bp->current_action = isset( $bp->action_variables[0] ) ? $bp->action_variables[0] : false;
             array_shift($bp->action_variables);
 
@@ -990 +990 @@
 
     /* If no current step is set, reset everything so we can start a fresh group creation */
-    if ( !$bp->groups->current_create_step = $bp->action_variables[1] ) {
+    if ( !isset( $bp->action_variables[1] ) || !$bp->groups->current_create_step = $bp->action_variables[1] ) {
 
         unset( $bp->groups->current_create_step );
@@ -1009 +1009 @@
 
     /* Fetch the currently completed steps variable */
-    if ( isset( $_COOKIE['bp_completed_create_steps'] ) && !$reset_steps )
+    if ( isset( $_COOKIE['bp_completed_create_steps'] ) && !isset( $reset_steps ) )
         $bp->groups->completed_create_steps = unserialize( stripslashes( $_COOKIE['bp_completed_create_steps'] ) );
 
@@ -1029 +1029 @@
                 bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
             }
-
-            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title( esc_attr( $_POST['group-name'] ) ) ), 'date_created' => bp_core_current_time(), 'status' => 'public' ) ) ) {
+            
+            $new_group_id = isset( $bp->groups->new_group_id ) ? $bp->groups->new_group_id : 0;
+
+            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title( esc_attr( $_POST['group-name'] ) ) ), 'date_created' => bp_core_current_time(), 'status' => 'public' ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
                 bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
@@ -1075 +1077 @@
          * holding the information
          */
-        if ( !in_array( $bp->groups->current_create_step, (array)$bp->groups->completed_create_steps ) )
+        $completed_create_steps = isset( $bp->groups->completed_create_steps ) ? $bp->groups->completed_create_steps : array();
+        if ( !in_array( $bp->groups->current_create_step, $completed_create_steps ) )
             $bp->groups->completed_create_steps[] = $bp->groups->current_create_step;
 
@@ -1108 +1111 @@
                 }
 
-                if ( $next ) {
+                if ( isset( $next ) ) {
                     $next_step = $key;
                     break;
@@ -1465 +1468 @@
      */
 
-    if ( $group_id )
+    if ( isset( $group_id ) && $group_id )
         $group = new BP_Groups_Group( $group_id );
     else
         $group = new BP_Groups_Group;
 
-    if ( $creator_id )
+    if ( isset( $creator_id ) && $creator_id )
         $group->creator_id = $creator_id;
     else

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

@@ -1130 +1130 @@
 
         // If they're not logged in or are banned from the group, no join button.
-        if ( !is_user_logged_in() || $group->is_banned )
+        if ( !is_user_logged_in() || isset( $group->is_banned ) )
             return false;
 
@@ -1633 +1633 @@
     global $bp;
 
-    if ( !$bp->groups->completed_create_steps )
+    if ( !isset( $bp->groups->completed_create_steps ) )
         return false;
 
@@ -1678 +1678 @@
     function bp_get_new_group_id() {
         global $bp;
-        return apply_filters( 'bp_get_new_group_id', $bp->groups->new_group_id );
+        
+        if ( isset( $bp->groups->new_group_id ) )
+            $new_group_id = $bp->groups->new_group_id;
+        else
+            $new_group_id = 0;
+        
+        return apply_filters( 'bp_get_new_group_id', $new_group_id );
     }
 
@@ -1686 +1692 @@
     function bp_get_new_group_name() {
         global $bp;
-        return apply_filters( 'bp_get_new_group_name', $bp->groups->current_group->name );
+        
+        if ( isset( $bp->groups->current_group->name ) )
+            $name = $bp->groups->current_group->name;
+        else
+            $name = '';
+        
+        return apply_filters( 'bp_get_new_group_name', $name );
     }
 
@@ -1694 +1706 @@
     function bp_get_new_group_description() {
         global $bp;
-        return apply_filters( 'bp_get_new_group_description', $bp->groups->current_group->description );
+        
+        if ( isset( $bp->groups->current_group->description ) )
+            $description = $bp->groups->current_group->description;
+        else
+            $description = '';
+            
+        return apply_filters( 'bp_get_new_group_description', $description );
     }