Changeset 9698 for trunk/src/bp-xprofile/bp-xprofile-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-xprofile/bp-xprofile-loader.php (modified) (1 diff)

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

@@ -96 +96 @@
         // Defined conditionally to accommodate unit tests
         if ( ! defined( 'BP_XPROFILE_BASE_GROUP_NAME' ) ) {
-            define( 'BP_XPROFILE_BASE_GROUP_NAME', stripslashes( $bp->site_options['bp-xprofile-base-group-name'] ) );
+            define( 'BP_XPROFILE_BASE_GROUP_NAME', stripslashes( bp_core_get_root_option( 'avatar_default' ) ) );
         }
 
         if ( ! defined( 'BP_XPROFILE_FULLNAME_FIELD_NAME' ) ) {
-            define( 'BP_XPROFILE_FULLNAME_FIELD_NAME', stripslashes( $bp->site_options['bp-xprofile-fullname-field-name'] ) );
+            define( 'BP_XPROFILE_FULLNAME_FIELD_NAME', stripslashes( bp_core_get_root_option( 'bp-xprofile-fullname-field-name' ) ) );
         }