Changeset 3555

Timestamp:

12/22/2010 01:13:29 AM (14 years ago)

Author:

boonebgorges

Message:

More glorious WP_DEBUG fixes

Location:

trunk

Files:

• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-groups.php (modified) (2 diffs)
• bp-groups/bp-groups-classes.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (4 diffs)

trunk/bp-core/bp-core-classes.php

@@ -507 +507 @@
         global $wpdb, $bp;
 
-        if ( $secondary_item_id )
-            $secondary_item_sql = $wpdb->prepare( " AND secondary_item_id = %d", $secondary_item_id );
+        $secondary_item_sql = !empty( $secondary_item_id ) ? $wpdb->prepare( " AND secondary_item_id = %d", $secondary_item_id ) : '';
 
         return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->core->table_name_notifications} WHERE user_id = %d AND item_id = %d AND component_name = %s AND component_action = %s{$secondary_item_sql}", $user_id, $item_id, $component_name, $component_action ) );

trunk/bp-groups.php

@@ -536 +536 @@
 
     if ( $bp->is_single_item ) {
-        if ( isset($bp->action_variables) && 'send' == $bp->action_variables[0] ) {
+        if ( !empty( $bp->action_variables[0] ) && 'send' == $bp->action_variables[0] ) {
 
             if ( !check_admin_referer( 'groups_send_invites', '_wpnonce_send_invites' ) )
@@ -1421 +1421 @@
 
             $group = new BP_Groups_Group( $group_id );
-            $user_url = bp_core_get_user_domain( $user_id );
+            $user_url = bp_core_get_user_domain( $bp->loggedin_user->id );
 
             if ( (int)$total_items > 1 )

trunk/bp-groups/bp-groups-classes.php

@@ -866 +866 @@
         global $wpdb, $bp;
 
-        if ( $limit && $page )
-            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+        $pag_sql = ( !empty( $limit ) && !empty( $page ) ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
         
-        if ( $exclude )
-            $exclude_sql = $wpdb->prepare( " AND g.id NOT IN (%s)", $exclude );
+        $exclude_sql = !empty( $exclude ) ? $wpdb->prepare( " AND g.id NOT IN (%s)", $exclude ) : '';
 
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d {$exclude_sql} ORDER BY m.date_modified ASC {$pag_sql}", $user_id ) );

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

@@ -1847 +1847 @@
 
         if ( !$group_id )
-            $group_id = ( $bp->groups->new_group_id ) ? $bp->groups->new_group_id : $bp->groups->current_group->id;
+            $group_id = !empty( $bp->groups->new_group_id ) ? $bp->groups->new_group_id : $bp->groups->current_group->id;
 
         $friends = friends_get_friends_invite_list( $bp->loggedin_user->id, $group_id );
@@ -1855 +1855 @@
 
             for ( $i = 0; $i < count( $friends ); $i++ ) {
-                if ( $invites ) {
-                    if ( in_array( $friends[$i]['id'], $invites ) ) {
+                $checked = '';
+                
+                if ( !empty( $invites ) ) {
+                    if ( in_array( $friends[$i]['id'], $invites ) )
                         $checked = ' checked="checked"';
-                    } else {
-                        $checked = '';
-                    }
                 }
 
@@ -2220 +2219 @@
 
     function the_invite() {
-        global $invite;
+        global $invite, $group_id;
 
         $this->in_the_loop = true;
@@ -2247 +2246 @@
     if ( !$group_id ) {
         /* Backwards compatibility */
-        if ( $bp->groups->current_group ) $group_id = $bp->groups->current_group->id;
-        if ( $bp->groups->new_group_id ) $group_id = $bp->groups->new_group_id;
+        if ( !empty( $bp->groups->current_group ) ) 
+            $group_id = $bp->groups->current_group->id;
+        if ( !empty( $bp->groups->new_group_id ) )
+            $group_id = $bp->groups->new_group_id;
     }