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

Timestamp:

07/26/2019 10:47:56 AM (5 years ago)

Author:

imath

Message:

Avatars: make sure to respect the "force_default" argument

If "force_default" is true:

1. do not attempt to scan for uploaded images,
2. ensure that the d parameter is set to default as passed from get_avatar(),
3. Do not do the default_avatar override.

Props boonebgorges, netweblogic

Fixes #8026

File:

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

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

@@ -477 +477 @@
 
     // Check for directory.
-    if ( file_exists( $avatar_folder_dir ) ) {
+    if ( ! $params['force_default'] && file_exists( $avatar_folder_dir ) ) {
 
         // Open directory.
@@ -638 +638 @@
         if ( ! empty( $params['force_default'] ) ) {
             $url_args['f'] = 'y';
+            $url_args['d'] = $params['default'];
         }
         if ( ! empty( $params['rating'] ) ) {
@@ -654 +655 @@
 
         // Only set default image if 'Gravatar Logo' is not requested.
-        if ( 'gravatar_default' !== $default_grav ) {
+        if ( ! $params['force_default'] && 'gravatar_default' !== $default_grav ) {
             $url_args['d'] = $default_grav;
         }