Changeset 3542

Timestamp:

12/19/2010 02:00:55 PM (14 years ago)

Author:

djpaul

Message:

Fixes some more PHP notices

Location:

trunk

Files:

• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-forums/bp-forums-filters.php (modified) (1 diff)
• bp-friends.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (2 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (1 diff)
• bp-messages/bp-messages-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (2 diffs)

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

@@ -284 +284 @@
         global $wpdb, $bp;
 
+        $pag_sql = '';
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );

trunk/bp-forums/bp-forums-filters.php

@@ -101 +101 @@
     global $bp;
 
-    if ( $bp->current_action == 'forum' && $bp->action_variables[0] == 'topic' ) {
-        if ( bp_has_forum_topic_posts() ) {
+    if ( $bp->current_action == 'forum' && !empty( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] )
+        if ( bp_has_forum_topic_posts() )
             $title .= ' | ' . bp_get_the_topic_title();
-        }
-    }
 
     return $title;

trunk/bp-friends.php

@@ -259 +259 @@
 
 function friends_delete_activity( $args ) {
+    global $bp;
+
     if ( function_exists('bp_activity_delete_by_item_id') ) {
         extract( (array)$args );

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

@@ -1006 +1006 @@
         global $bp, $wpdb;
 
+        $pag_sql = '';
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
+        $exclude_admins_sql = '';
         if ( $exclude_admins_mods )
             $exclude_admins_sql = $wpdb->prepare( "AND is_admin = 0 AND is_mod = 0" );
 
+        $banned_sql = '';
         if ( $exclude_banned )
             $banned_sql = $wpdb->prepare( " AND is_banned = 0" );
 
+        $exclude_sql = '';
         if ( $exclude )
             $exclude_sql = $wpdb->prepare( " AND m.user_id NOT IN ({$exclude})" );
@@ -1026 +1030 @@
             return false;
 
-        if ( !isset($pag_sql) )
-            $total_member_count = count($members);
+        if ( empty( $pag_sql ) )
+            $total_member_count = count( $members );
         else
             $total_member_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(user_id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_admins_sql} {$exclude_sql}", $group_id ) );

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

@@ -1504 +1504 @@
         global $members_template;
 
-        if ( null === $members_template->member->is_friend )
+        if ( !isset( $members_template->member->is_friend ) )
             $friend_status = 'not_friends';
         else

trunk/bp-messages/bp-messages-classes.php

@@ -81 +81 @@
         global $wpdb, $bp;
 
+        $pag_sql = '';
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
+        $type_sql = '';
         if ( $type == 'unread' )
             $type_sql = $wpdb->prepare( " AND r.unread_count != 0 " );
-        else if ( $type == 'read' )
+        elseif ( $type == 'read' )
             $type_sql = $wpdb->prepare( " AND r.unread_count = 0 " );
 

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -116 +116 @@
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
-
-        $group_id_sql = '';
+        $where_sql = '';
+
         if ( $profile_group_id )
             $where_sql = $wpdb->prepare( 'WHERE g.id = %d', $profile_group_id );
-        else if ( $exclude_groups )
+        elseif ( $exclude_groups )
             $where_sql = $wpdb->prepare( "WHERE g.id NOT IN ({$exclude_groups})");
 
@@ -141 +141 @@
             return $groups;
 
+        $exclude_fields_sql = '';
         if ( $exclude_fields )
             $exclude_fields_sql = $wpdb->prepare( "AND id NOT IN ({$exclude_fields})" );