Changeset 3699

Timestamp:

01/11/2011 06:16:21 PM (16 years ago)

Author:

djpaul

Message:

Add filter to allow gravatar lookups to be disabled site-wide. Fixes #2697, props boonebgorges for initial patch.

File:

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

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

@@ -229 +229 @@
 
         // Skips gravatar check if $no_grav is passed
-        if ( !$no_grav ) {
+        if ( ! apply_filters( 'bp_core_fetch_avatar_no_grav', $no_grav ) ) {
 
                 // Set gravatar size
@@ -266 +266 @@
                 $gravatar       = apply_filters( 'bp_gravatar_url', $host ) . md5( strtolower( $email ) ) . '?d=' . $default_grav . '&s=' . $grav_size;
 
-                // Return gravatar wrapped in <img />
-                if ( true === $html )
-                        return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
-
-                // ...or only return the gravatar URL
-                else
-                        return apply_filters( 'bp_core_fetch_avatar_url', $gravatar );
-
         } else {
-                return apply_filters( 'bp_core_fetch_avatar', false, $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
-        }
+                // No avatar was found, and we've been told not to use a gravatar.
+                $gravatar = apply_filters( "bp_core_default_avatar_$object", BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg', $params ); 
+        }
+
+        if ( true === $html )
+                return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
+        else
+                return apply_filters( 'bp_core_fetch_avatar_url', $gravatar );
 }