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

Timestamp:

01/25/2020 06:18:04 AM (5 years ago)

Author:

imath

Message:

Prevent errors when get_avatar() is used before BP Globals are set

In this case we need to make sure the buddypress()->avatar object is set before checking its show_avatars property into the function used to filter get_avatar().

Props shanebp

Fixes #8177

File:

• trunk/src/bp-core/bp-core-avatars.php (modified) (1 diff)

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

@@ -194 +194 @@
 
     // If avatars are disabled for the root site, obey that request and bail.
-    if ( ! $bp->avatar->show_avatars ) {
+    if ( ! $bp->avatar || ! $bp->avatar->show_avatars ) {
         return;
     }