Changeset 3357

Timestamp:

11/05/2010 09:37:15 PM (15 years ago)

Author:

djpaul

Message:

Fix some wp_debug warnings.

Location:

trunk

Files:

• bp-core.php (modified) (4 diffs)
• bp-core/bp-core-avatars.php (modified) (1 diff)
• bp-core/bp-core-catchuri.php (modified) (3 diffs)
• bp-core/bp-core-notifications.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-forums.php (modified) (2 diffs)
• bp-groups.php (modified) (1 diff)
• bp-messages.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)

trunk/bp-core.php

@@ -147 +147 @@
 
     /* Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar */
-    $bp->grav_default->user  = apply_filters( 'bp_user_gravatar_default', $bp->site_options['user-avatar-default'] );
+    $default_grav = isset( $bp->site_options['user-avatar-default'] ) ? $bp->site_options['user-avatar-default'] : 'wavatar';
+    $bp->grav_default->user  = apply_filters( 'bp_user_gravatar_default', $default_grav );
     $bp->grav_default->group = apply_filters( 'bp_group_gravatar_default', 'identicon' );
     $bp->grav_default->blog  = apply_filters( 'bp_blog_gravatar_default', 'identicon' );
@@ -1018 +1019 @@
             $ud = false;
 
-            if ( $bp->loggedin_user->id == $user_id )
+            if ( isset( $bp->loggedin_user->id ) && $bp->loggedin_user->id == $user_id )
                 $ud = &$bp->loggedin_user->userdata;
 
-            if ( $bp->displayed_user->id == $user_id )
+            if ( isset( $bp->displayed_user->id ) && $bp->displayed_user->id == $user_id )
                 $ud = &$bp->displayed_user->userdata;
 
@@ -1138 +1139 @@
     if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
         if ( bp_is_active( 'xprofile' ) ) {
-            $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
+            $fullname = xprofile_get_field_data( $bp->site_options['bp-xprofile-fullname-field-name'], $user_id );
 
             if ( empty($fullname) ) {
@@ -1315 +1316 @@
     global $bp;
 
-    if ( empty( $bp->template_message ) )
+    if ( empty( $bp->template_message ) && isset( $_COOKIE['bp-message'] ) )
         $bp->template_message = $_COOKIE['bp-message'];
 
-    if ( empty( $bp->template_message_type ) )
+    if ( empty( $bp->template_message_type ) && isset( $_COOKIE['bp-message-type'] ) )
         $bp->template_message_type = $_COOKIE['bp-message-type'];
 

trunk/bp-core/bp-core-avatars.php

@@ -33 +33 @@
 
     if ( !defined( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE' ) ) {
-        if ( !$bp->site_options['fileupload_maxk'] )
+        if ( !isset( $bp->site_options['fileupload_maxk'] ) )
             define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', 5120000 ); /* 5mb */
         else

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

@@ -164 +164 @@
                 unset( $bp_uri[$i] );
 
-            $current_component = $bp_uri[$uri_offset];
+            $current_component = isset( $bp_uri[$uri_offset] ) ? $bp_uri[$uri_offset] : '';
         }
     }
@@ -185 +185 @@
 
     // Set the current action
-    $current_action = $bp_uri[$i];
+    $current_action = isset( $bp_uri[$i] ) ? $bp_uri[$i] : '';
 
     // Unset the current_component and action from action_variables
@@ -195 +195 @@
 
     // Remove the username from action variables if this is not a VHOST install
-    if ( 'no' == VHOST && !$is_root_component )
+    if ( defined( 'VHOST' ) && 'no' == VHOST && !$is_root_component )
         array_shift($bp_uri);
 

trunk/bp-core/bp-core-notifications.php

@@ -43 +43 @@
     for ( $i = 0; $i < count($notifications); $i++ ) {
         $notification = $notifications[$i];
-
         $grouped_notifications[$notification->component_name][$notification->component_action][] = $notification;
     }
 
-    if ( !$grouped_notifications )
+    if ( empty( $grouped_notifications ) )
         return false;
 

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

@@ -1569 +1569 @@
     global $bp;
 
-    if ( BP_BLOGS_SLUG == $bp->current_component )
+    if ( is_multisite() && BP_BLOGS_SLUG == $bp->current_component )
         return true;
 

trunk/bp-forums.php

@@ -21 +21 @@
 
     $bp->forums->image_base = BP_PLUGIN_URL . '/bp-forums/images';
-    $bp->forums->bbconfig = $bp->site_options['bb-config-location'];
     $bp->forums->slug = BP_FORUMS_SLUG;
+
+    if ( isset( $bp->site_options['bb-config-location'] ) )
+        $bp->forums->bbconfig = $bp->site_options['bb-config-location'];
 
     /* Register this in the active components array */
@@ -536 +538 @@
     global $bp, $wp_roles, $bb_table_prefix;
 
+    if ( !isset( $bp->loggedin_user->id ) )
+        return $allcaps;
+
     $bb_cap = get_user_meta( $bp->loggedin_user->id, $bb_table_prefix . 'capabilities', true );
 

trunk/bp-groups.php

@@ -166 +166 @@
     global $bp;
 
-    if ( !$bp->groups->current_group )
+    if ( empty( $bp->groups->current_group ) )
         return false;
 

trunk/bp-messages.php

@@ -41 +41 @@
 
     /* Add the subnav items to the profile */
-    bp_core_new_subnav_item( array( 'name' => __( 'Inbox', 'buddypress' ) . $count_indicator, 'slug' => 'inbox', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_inbox', 'position' => 10, 'user_has_access' => bp_is_my_profile() ) );
+    bp_core_new_subnav_item( array( 'name' => __( 'Inbox', 'buddypress' ), 'slug' => 'inbox', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_inbox', 'position' => 10, 'user_has_access' => bp_is_my_profile() ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Sent Messages', 'buddypress' ), 'slug' => 'sentbox', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_sentbox', 'position' => 20, 'user_has_access' => bp_is_my_profile() ) );
     bp_core_new_subnav_item( array( 'name' => __( 'Compose', 'buddypress' ), 'slug' => 'compose', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_compose', 'position' => 30, 'user_has_access' => bp_is_my_profile() ) );

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

@@ -474 +474 @@
         global $wpdb, $bp;
 
-        if ( !$bp->profile->table_name_fields || !$field_name )
+        if ( empty( $bp->profile->table_name_fields ) || !isset( $field_name ) )
             return false;