Changeset 6881

Timestamp:

04/02/2013 05:34:41 PM (11 years ago)

Author:

boonebgorges

Message:

Cache the value of show_avatars, and check cached value in bp_core_fetch_avatar()

Calling bp_get_option() requires calling switch_to_blog() when not on the root
blog, so we want to avoid doing gratuitous calls to that function. This
changeset moves the bp_get_option( 'show_avatars' ) call to the BP avatar
initialization process, so that it's only checked once per page load.
Subsequent checks of the show_avatar setting are then made against the cached
value.

Fixes #4908

Props wpdennis

File:

• trunk/bp-core/bp-core-avatars.php (modified) (2 diffs)

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

@@ -72 +72 @@
     $bp->avatar->url         = bp_core_avatar_url();
 
+    // Cache the root blog's show_avatars setting, to avoid unnecessary
+    // calls to switch_to_blog()
+    $bp->avatar->show_avatars = (bool) bp_get_option( 'show_avatars' );
+
     // Backpat for pre-1.5
     if ( ! defined( 'BP_AVATAR_UPLOAD_PATH' ) )
@@ -97 +101 @@
 
     // If avatars are disabled for the root site, obey that request and bail
-    if ( ! bp_get_option( 'show_avatars' ) )
+    if ( ! buddypress()->avatar->show_avatars )
         return;