Index: gravatar.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gravatar/gravatar.module,v
retrieving revision 1.7
diff -u -r1.7 gravatar.module
--- gravatar.module	14 Mar 2008 00:54:04 -0000	1.7
+++ gravatar.module	2 May 2008 10:12:38 -0000
@@ -87,6 +87,7 @@
    if (variable_get('user_pictures', 0)) {
       
       $account = $variables['account'];
+      $data    = (object)unserialize($account->data);
       $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous'))));
       
       // gravatar is enabled
@@ -96,8 +97,8 @@
          if (empty($account->uid)) {
             $gravatar = gravatar_get_gravatar($account->mail);
          }
-         else if ($account->gravatar_mode) {
-            $gravatar =  gravatar_get_gravatar( (empty($account->gravatar_email) ? $account->mail : $account->gravatar_email));
+         else if ($data->gravatar_mode) {
+            $gravatar = gravatar_get_gravatar(($data->gravatar_email ? $data->gravatar_email : user_load(array('uid' => $account->uid))->mail));
          }
          // yeah yeah, redundancy 
          else if (!empty($account->picture) && file_exists($account->picture)) {