Changeset 1012313

Timestamp:

10/22/2014 07:09:50 PM (11 years ago)

Author:

miled

Message:

Only Overwrite gravatars

File:

• wordpress-social-login/trunk/includes/services/wsl.user.avatar.php (modified) (3 diffs)

wordpress-social-login/trunk/includes/services/wsl.user.avatar.php

@@ -30 +30 @@
         //Check if avatars are enabled
         if( ! get_option( 'wsl_settings_users_avatars' ) )
+        {
+            return $html;
+        }
+
+        //Only Overwrite gravatars
+        if( ! stristr( strtolower( $html ), 'gravatar.com' ) )
         {
             return $html;
@@ -114 +120 @@
         }
 
+        //Only Overwrite gravatars
+        if( ! stristr( strtolower( $html ), 'gravatar.com' ) )
+        {
+            return $html;
+        }
+
         $user_id = null;
 
@@ -125 +137 @@
                 if( ! empty( $args ['item_id'] ) AND is_numeric( $args ['item_id'] ) )
                 {
-                    //Overwrite gravatars
-                    if( stristr( strtolower( $html ), '.gravatar.com' ) )
+                    $user_id = $args['item_id'];
+
+                    $wsl_avatar = wsl_get_user_custom_avatar( $user_id );
+
+                    //Retrieve Avatar
+                    if( $wsl_avatar )
                     {
-                        $user_id = $args['item_id'];
+                        $img_class  = ('class="' .(!empty($args ['class']) ?($args ['class'] . ' ') : '') . 'avatar-wordpress-social-login" ');
+                        $img_width  = (!empty($args ['width']) ? 'width="' . $args ['width'] . '" ' : 'width="' . bp_core_avatar_full_width() . '" ' );
+                        $img_height = (!empty($args ['height']) ? 'height="' . $args ['height'] . '" ' : 'height="' . bp_core_avatar_full_height() . '" ' );
+                        $img_alt    = (!empty( $args['alt'] ) ? 'alt="' . esc_attr( $args['alt'] ) . '" ' : '' );
 
-                        $wsl_avatar = wsl_get_user_custom_avatar( $user_id );
+                        //Replace
+                        $wsl_html = preg_replace('#<img[^>]+>#i', '<img src="' . $wsl_avatar . '" ' . $img_alt . $img_class . $img_height . $img_width . '/>', $html );
 
-                        //Retrieve Avatar
-                        if( $wsl_avatar )
-                        {
-                            $img_class  = ('class="' .(!empty($args ['class']) ?($args ['class'] . ' ') : '') . 'avatar-wordpress-social-login" ');
-                            $img_width  = (!empty($args ['width']) ? 'width="' . $args ['width'] . '" ' : 'width="' . bp_core_avatar_full_width() . '" ' );
-                            $img_height = (!empty($args ['height']) ? 'height="' . $args ['height'] . '" ' : 'height="' . bp_core_avatar_full_height() . '" ' );
-                            $img_alt    = (!empty( $args['alt'] ) ? 'alt="' . esc_attr( $args['alt'] ) . '" ' : '' );
-
-                            //Replace
-                            $wsl_html = preg_replace('#<img[^>]+>#i', '<img src="' . $wsl_avatar . '" ' . $img_alt . $img_class . $img_height . $img_width . '/>', $html );
-
-                            // HOOKABLE: 
-                            return apply_filters( 'wsl_hook_alter_get_bp_user_custom_avatar', $wsl_html, $user_id, $wsl_avatar, $html, $args );
-                        }
+                        // HOOKABLE: 
+                        return apply_filters( 'wsl_hook_alter_get_bp_user_custom_avatar', $wsl_html, $user_id, $wsl_avatar, $html, $args );
                     }
                 }
             }
-        } 
+        }
 
         return $html;