Changeset 6023

Timestamp:

05/11/2012 05:55:13 PM (13 years ago)

Author:

boonebgorges

Message:

Don't assign values to undefined objects throughout BP. Fixes #4191. Props leemour

Location:

trunk

Files:

• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-core/bp-core-avatars.php (modified) (1 diff)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-core/bp-core-loader.php (modified) (2 diffs)
• bp-forums/bp-forums-template.php (modified) (1 diff)

trunk/bp-activity/bp-activity-functions.php

@@ -198 +198 @@
 
     // Set activity action
+    if ( !isset( $bp->activity->actions ) || !is_object( $bp->activity->actions ) ) {
+        $bp->activity->actions = new stdClass;
+    }
+
+    if ( !isset( $bp->activity->actions->{$component_id} ) || !is_object( $bp->activity->actions->{$component_id} ) ) {
+        $bp->activity->actions->{$component_id} = new stdClass;
+    }
+
     $bp->activity->actions->{$component_id}->{$key} = apply_filters( 'bp_activity_set_action', array(
         'key'   => $key,

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

@@ -49 +49 @@
 function bp_core_set_avatar_globals() {
     global $bp;
+
+    $bp->avatar        = new stdClass;
+    $bp->avatar->thumb = new stdClass;
+    $bp->avatar->full  = new stdClass;
 
     // Dimensions

trunk/bp-core/bp-core-functions.php

@@ -179 +179 @@
             foreach ( (array) $page_names as $page_name ) {
                 if ( $page_name->ID == $page_id ) {
+                    if ( !isset( $pages->{$component_id} ) || !is_object( $pages->{$component_id} ) ) {
+                        $pages->{$component_id} = new stdClass;
+                    }
+
                     $pages->{$component_id}->name  = $page_name->post_name;
                     $pages->{$component_id}->id    = $page_name->ID;

trunk/bp-core/bp-core-loader.php

@@ -163 +163 @@
 
         // The user ID of the user who is currently logged in.
+        $bp->loggedin_user       = new stdClass;
         $bp->loggedin_user->id   = isset( $current_user->ID ) ? $current_user->ID : 0;
 
@@ -168 +169 @@
 
         // Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar
+        $bp->grav_default        = new stdClass;
         $bp->grav_default->user  = apply_filters( 'bp_user_gravatar_default',  $bp->site_options['avatar_default'] );
         $bp->grav_default->group = apply_filters( 'bp_group_gravatar_default', $bp->grav_default->user );

trunk/bp-forums/bp-forums-template.php

@@ -1038 +1038 @@
         $this->topic_tags = bb_get_topic_tags( $this->topic_id );
 
+        $this->pag = new stdClass;
+
         if ( (int) $this->total_post_count && (int) $this->pag_num ) {
             $this->pag_links = paginate_links( array(