Changeset 9698 for trunk/src/bp-groups/bp-groups-loader.php

Timestamp:

04/05/2015 06:18:13 PM (10 years ago)

Author:

boonebgorges

Message:

Introduce bp_core_get_root_option() and use throughout BP.

Previously, we referenced the $bp->site_options array directly. This causes
problems in cases where these options may be referenced before the array is
initially populated. bp_core_get_root_option() will fetch the requested
value from the array if it's been populated, and will populate it if it has not.

Fixes #6045.

File:

• trunk/src/bp-groups/bp-groups-loader.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-loader.php

@@ -299 +299 @@
 
         // If avatar uploads are not disabled, add avatar option
-        if ( ! (int) $bp->site_options['bp-disable-avatar-uploads'] && $bp->avatar->show_avatars ) {
+        $disabled_avatar_uploads = (int) bp_core_get_root_option( 'bp-disable-avatar-uploads' );
+        if ( ! $disabled_avatar_uploads && $bp->avatar->show_avatars ) {
             $this->group_creation_steps['group-avatar'] = array(
                 'name'     => _x( 'Photo', 'Group screen nav', 'buddypress' ),