Changeset 10369

Timestamp:

11/19/2015 06:42:56 PM (9 years ago)

Author:

r-a-y

Message:

Avatars: Fix issue when selecting 'Gravatar Logo' from 'Settings > Discussion > Default Avatar'.

If 'Gravatar Logo' was selected from the 'Settings > Discussion' admin
page, avatars on BuddyPress pages that did not have a valid Gravatar would
not display properly.

This is a regression due to changes in #6622.

Fixes #6737 (2.4-branch).

Props henry.wright.

File:

• branches/2.4/src/bp-core/bp-core-avatars.php (modified) (2 diffs)

branches/2.4/src/bp-core/bp-core-avatars.php

@@ -624 +624 @@
         // Main Gravatar URL args
         $url_args = array(
-            'd' => $default_grav,
             's' => $params['width']
         );
@@ -634 +633 @@
         if ( ! empty( $params['rating'] ) ) {
             $url_args['r'] = strtolower( $params['rating'] );
+        }
+        // Only set default image if 'Gravatar Logo' is not requested
+        if ( 'gravatar_default' !== $default_grav ) {
+            $url_args['d'] = $default_grav;
         }