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

trunk/src/bp-blogs/bp-blogs-filters.php

@@ -87 +87 @@
      * That plugin changed the way its settings were stored at some point. Thus the dual check.
      */
-    if ( ! empty( $bp->site_options['sitewide_tags_blog'] ) ) {
-        $st_options = maybe_unserialize( $bp->site_options['sitewide_tags_blog'] );
+    $sitewide_tags_blog_settings = bp_core_get_root_option( 'sitewide_tags_blog' );
+    if ( ! empty( $sitewide_tags_blog_settings ) ) {
+        $st_options = maybe_unserialize( $sitewide_tags_blog_settings );
         $tags_blog_id = isset( $st_options['tags_blog_id'] ) ? $st_options['tags_blog_id'] : 0;
     } else {
-        $tags_blog_id = isset( $bp->site_options['tags_blog_id'] ) ? $bp->site_options['tags_blog_id'] : 0;
+        $tags_blog_id = bp_core_get_root_option( 'sitewide_tags_blog' );
+        $tags_blog_id = intval( $tags_blog_id );
     }