Changeset 9698 for trunk/src/bp-core/bp-core-avatars.php

Timestamp:

04/05/2015 06:18:13 PM (9 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-core/bp-core-avatars.php (modified) (1 diff)

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

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