Changeset 3365

Timestamp:

11/06/2010 07:04:00 PM (14 years ago)

Author:

djpaul

Message:

Fixes quite a lot more WP_DEBUG warnings.

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-activity/bp-activity-classes.php (modified) (3 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (4 diffs)
• bp-core.php (modified) (2 diffs)
• bp-core/bp-core-adminbar.php (modified) (2 diffs)
• bp-core/bp-core-signup.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (3 diffs)
• bp-forums.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (3 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (1 diff)
• bp-messages/bp-messages-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-default/functions.php (modified) (1 diff)
• bp-xprofile.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-cssjs.php (modified) (1 diff)

trunk/bp-activity.php

@@ -247 +247 @@
                 $redirect = bp_get_group_permalink( $group ) . $bp->activity->slug . '/' . $activity->id . '/';
         }
-    } else
+    } else {
         $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id;
+    }
 
     $redirect = apply_filters( 'bp_activity_permalink_redirect_url', $redirect, &$activity );

trunk/bp-activity/bp-activity-classes.php

@@ -179 +179 @@
             return false;
 
+        $pag_sql = '';
         if ( $per_page && $page )
             $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
@@ -337 +338 @@
         global $bp, $wpdb;
 
+        $activity_comments = array();
+
         /* Now fetch the activity comments and parse them into the correct position in the activities array. */
         foreach( (array)$activities as $activity ) {
@@ -345 +348 @@
         /* Merge the comments with the activity items */
         foreach( (array)$activities as $key => $activity )
-            $activities[$key]->children = $activity_comments[$activity->id];
+            if ( isset( $activity_comments[$activity->id] ) )
+                $activities[$key]->children = $activity_comments[$activity->id];
 
         return $activities;

trunk/bp-activity/bp-activity-templatetags.php

@@ -642 +642 @@
         global $activities_template, $bp;
 
-        if ( !$activities_template->activity->children )
+        if ( !isset( $activities_template->activity->children ) || !$activities_template->activity->children )
             return false;
 
@@ -690 +690 @@
         global $activities_template, $bp;
 
-        if ( !$activities_template->activity->children )
+        if ( !isset( $activities_template->activity->children ) || !$activities_template->activity->children )
             return 0;
 
@@ -724 +724 @@
     function bp_get_activity_comment_form_nojs_display() {
         global $activities_template;
-        if ( $_GET['ac'] == $activities_template->activity->id . '/' )
+        if ( isset( $_GET['ac'] ) && $_GET['ac'] == $activities_template->activity->id . '/' )
             return 'style="display: block"';
 
@@ -932 +932 @@
             return false;
 
-        return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->activity->slug . '/?r=' . bp_core_get_username( $bp->displayed_user->user_id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
+        return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->activity->slug . '/?r=' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
     }
 

trunk/bp-core.php

@@ -1341 +1341 @@
     global $bp;
 
-    if ( $bp->template_message ) {
+    if ( isset( $bp->template_message ) && $bp->template_message ) {
         $type = ( 'success' == $bp->template_message_type ) ? 'updated' : 'error';
     ?>
@@ -1937 +1937 @@
 function bp_core_add_ajax_hook() {
     /* Theme only, we already have the wp_ajax_ hook firing in wp-admin */
-    if ( !defined( 'WP_ADMIN' ) )
+    if ( !defined( 'WP_ADMIN' ) && isset( $_REQUEST['action'] ) )
         do_action( 'wp_ajax_' . $_REQUEST['action'] );
 }

trunk/bp-core/bp-core-adminbar.php

@@ -7 +7 @@
         return false;
 
-    if ( (int)$bp->site_options['hide-loggedout-adminbar'] && !is_user_logged_in() )
+    if ( isset( $bp->site_options['hide-loggedout-adminbar'] ) && (int)$bp->site_options['hide-loggedout-adminbar'] && !is_user_logged_in() )
         return false;
 
@@ -76 +76 @@
 
             foreach( (array)$bp->bp_options_nav[$nav_item['slug']] as $subnav_item ) {
-                $link = str_replace( $bp->displayed_user->domain, $bp->loggedin_user->domain, $subnav_item['link'] );
-                $name = str_replace( $bp->displayed_user->userdata->user_login, $bp->loggedin_user->userdata->user_login, $subnav_item['name'] );
+                $link = $subnav_item['link'];
+                $name = $subnav_item['name'];
+
+                if ( isset( $bp->displayed_user->domain ) )
+                    $link = str_replace( $bp->displayed_user->domain, $bp->loggedin_user->domain, $subnav_item['link'] );
+
+                if ( isset( $bp->displayed_user->userdata->user_login ) )
+                    $name = str_replace( $bp->displayed_user->userdata->user_login, $bp->loggedin_user->userdata->user_login, $subnav_item['name'] );
+
                 $alt = ( 0 == $sub_counter % 2 ) ? ' class="alt"' : '';
                 echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $link . '">' . $name . '</a></li>';

trunk/bp-core/bp-core-signup.php

@@ -614 +614 @@
 /* Kill the wp-signup.php if custom registration signup templates are present */
 function bp_core_wpsignup_redirect() {
-    if ( false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php') && $_GET['action'] != 'register' )
+    $action = '';
+    if ( isset( $_GET['action'] ) )
+        $action = $_GET['action'];
+
+    if ( false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php' ) && $action != 'register' )
         return false;
 

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

@@ -1308 +1308 @@
     global $bp;
 
-    $bp->ajax_querystring = apply_filters( 'bp_ajax_querystring', $query_string, $object );
-    return $bp->ajax_querystring;
+    if ( !isset( $bp->ajax_querystring ) )
+        $bp->ajax_querystring = '';
+
+    return apply_filters( 'bp_ajax_querystring', $bp->ajax_querystring, $object );
 }
 
@@ -1650 +1652 @@
     global $bp;
 
-    if ( BP_XPROFILE_SLUG == $bp->current_component || $bp->core->profile->slug == $bp->current_component )
+    if ( defined( 'BP_XPROFILE_SLUG' ) && BP_XPROFILE_SLUG == $bp->current_component || isset( $bp->core->profile->slug ) && $bp->core->profile->slug == $bp->current_component )
         return true;
 
@@ -1686 +1688 @@
     global $bp;
 
-    if ( BP_GROUPS_SLUG == $bp->current_component && $bp->groups->current_group )
+    if ( BP_GROUPS_SLUG == $bp->current_component && isset( $bp->groups->current_group ) && $bp->groups->current_group )
         return true;
 

trunk/bp-forums.php

@@ -36 +36 @@
     global $bp;
 
-    if ( file_exists( $bp->forums->bbconfig ) )
+    if ( isset( $bp->forums->bbconfig ) && file_exists( $bp->forums->bbconfig ) )
         return true;
 

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

@@ -293 +293 @@
         global $wpdb, $bp;
 
+        $pag_sql = '';
         if ( $limit && $page )
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
+        $hidden_sql = '';
         if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
             $hidden_sql = "AND g.status != 'hidden'";
 
+        $search_sql = '';
         if ( $search_terms ) {
             $search_terms = like_escape( $wpdb->escape( $search_terms ) );
@@ -313 +316 @@
         }
 
+        $group_ids = array();
         if ( !empty( $populate_extras ) ) {
             foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
@@ -605 +609 @@
         global $wpdb, $bp;
 
+        $hidden_sql = '';
         if ( !is_super_admin() )
             $hidden_sql = "WHERE status != 'hidden'";

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

@@ -148 +148 @@
     /* Type */
     if ( 'my-groups' == $bp->current_action ) {
-        if ( 'most-popular' == $order )
+        if ( 'most-popular' == $order ) {
             $type = 'popular';
-        else if ( 'alphabetically' == $order )
+        } elseif ( 'alphabetically' == $order ) {
             $type = 'alphabetical';
-    } else if ( 'invites' == $bp->current_action ) {
+        }
+    } elseif ( 'invites' == $bp->current_action ) {
         $type = 'invites';
-    } else if ( $bp->groups->current_group->slug ) {
+    } elseif ( isset( $bp->groups->current_group->slug ) && $bp->groups->current_group->slug ) {
         $type = 'single-group';
         $slug = $bp->groups->current_group->slug;

trunk/bp-messages/bp-messages-templatetags.php

@@ -505 +505 @@
             return false;
 
-        return apply_filters( 'bp_get_send_private_message_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/compose/?r=' . bp_core_get_username( $bp->displayed_user->user_id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
+        return apply_filters( 'bp_get_send_private_message_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/compose/?r=' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
     }
 

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -60 +60 @@
     $query_string = empty( $qs ) ? '' : join( '&', (array)$qs );
 
-    return apply_filters( 'bp_dtheme_ajax_querystring', $query_string, $object, $_BP_COOKIE['bp-' . $object . '-filter'], $_BP_COOKIE['bp-' . $object . '-scope'], $_BP_COOKIE['bp-' . $object . '-page'], $_BP_COOKIE['bp-' . $object . '-search-terms'], $_BP_COOKIE['bp-' . $object . '-extras'] );
+    $object_filter = '';
+    if ( isset( $_BP_COOKIE['bp-' . $object . '-filter'] ) )
+        $object_filter = $_BP_COOKIE['bp-' . $object . '-filter'];
+
+    $object_scope = '';
+    if ( isset( $_BP_COOKIE['bp-' . $object . '-scope'] ) )
+        $object_scope = $_BP_COOKIE['bp-' . $object . '-scope'];
+
+    $object_page = '';
+    if ( isset( $_BP_COOKIE['bp-' . $object . '-page'] ) )
+        $object_page = $_BP_COOKIE['bp-' . $object . '-page'];
+
+    $object_search_terms = '';
+    if ( isset( $_BP_COOKIE['bp-' . $object . '-search-terms'] ) )
+        $object_search_terms = $_BP_COOKIE['bp-' . $object . '-search-terms'];
+
+    $object_extras = '';
+    if ( isset( $_BP_COOKIE['bp-' . $object . '-extras'] ) )
+        $object_extras = $_BP_COOKIE['bp-' . $object . '-extras'];
+
+    return apply_filters( 'bp_dtheme_ajax_querystring', $query_string, $object, $object_filter, $object_scope, $object_page, $object_search_terms, $object_extras );
 }
 add_filter( 'bp_ajax_querystring', 'bp_dtheme_ajax_querystring', 10, 2 );

trunk/bp-themes/bp-default/functions.php

@@ -34 +34 @@
     'show_all'          => __( 'Show all', 'buddypress' ),
     'comments'          => __( 'comments', 'buddypress' ),
-    'close'             => __( 'Close', 'buddypress' ),
-    'mention_explain'   => sprintf( __( "%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", 'buddypress' ), '@' . bp_get_displayed_user_username(), bp_get_user_firstname( bp_get_displayed_user_fullname() ), bp_get_user_firstname( bp_get_displayed_user_fullname() ) )
+    'close'             => __( 'Close', 'buddypress' )
 );
+
+if ( bp_is_profile_component() && !bp_is_directory() )
+    $params['mention_explain'] = sprintf( __( "%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", 'buddypress' ), '@' . bp_get_displayed_user_username(), bp_get_user_firstname( bp_get_displayed_user_fullname() ), bp_get_user_firstname( bp_get_displayed_user_fullname() ) );
+
 wp_localize_script( 'dtheme-ajax-js', 'BP_DTheme', $params );
 

trunk/bp-xprofile.php

@@ -18 +18 @@
 function xprofile_setup_globals() {
     global $bp, $wpdb;
+
+    if ( isset( $bp->profile->id ) )
+        return;
 
     if ( !defined( 'BP_XPROFILE_SLUG' ) )
@@ -601 +604 @@
     global $bp;
 
+    // This is required because of a call to bp_core_get_user_displayname() in bp_core_setup_globals()
+    if ( !isset( $bp->profile->id ) )
+        xprofile_setup_globals();
+
     if ( !$user_id )
         $user_id = $bp->displayed_user->id;

trunk/bp-xprofile/bp-xprofile-cssjs.php

@@ -7 +7 @@
 
 function xprofile_add_admin_js() {
-    if ( strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
+    if ( isset( $_GET['page'] ) && strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
         wp_enqueue_script( 'jquery-ui-core' );
         wp_enqueue_script( 'jquery-ui-tabs' );