Changeset 11194

Timestamp:

10/15/2016 05:47:54 PM (8 years ago)

Author:

r-a-y

Message:

Avatars: Fix issue with wrong avatar showing in the WP Toolbar when on the "Settings > Discussion" page.

Props henry.wright, swissspidy.

Hat-tip mercime for finding out that this ticket was closed without being
committed :)

Fixes #6298.

File:

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

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

@@ -1385 +1385 @@
     global $pagenow;
 
-    // Do not filter if inside WordPress options page.
-    if ( 'options-discussion.php' == $pagenow )
+    // Don't filter if inside WordPress options page and force_default is true.
+    if ( 'options-discussion.php' === $pagenow && true === $args['force_default'] ) {
         return $avatar;
+    }
 
     // If passed an object, assume $user->user_id.