diff --git a/drupal/sites/default/boinc/modules/boincuser/includes/boincuser.forms.inc b/drupal/sites/default/boinc/modules/boincuser/includes/boincuser.forms.inc index 20b354e4a2..f224b13339 100644 --- a/drupal/sites/default/boinc/modules/boincuser/includes/boincuser.forms.inc +++ b/drupal/sites/default/boinc/modules/boincuser/includes/boincuser.forms.inc @@ -343,8 +343,7 @@ function boincuser_account_validate($edit, $account) { require_boinc('boinc_db'); $boinc_user = BoincUser::lookup_email_addr($account->mail); $changing_email = ($edit['mail'] AND $edit['mail'] != $account->mail) ? true : false; - $changing_pass = ($edit['pass']['pass1']) ? true : false; - // + $changing_pass = ($edit['pass']) ? true : false; if ($changing_email) { // E-mail address is set to change; check for an existing BOINC user $boinc_user_already_exists = BoincUser::lookup_email_addr($edit['mail']); diff --git a/drupal/sites/default/boinc/themes/boinc/templates/search-result.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/search-result.tpl.php index 6b5c120ecd..829b7983b7 100644 --- a/drupal/sites/default/boinc/themes/boinc/templates/search-result.tpl.php +++ b/drupal/sites/default/boinc/themes/boinc/templates/search-result.tpl.php @@ -57,7 +57,7 @@ $node = node_load($nid); $account = user_load($node->uid); if (isset($account)) { - $user_image = boincuser_get_user_profile_image($account->uid); + $user_image = boincuser_get_user_profile_image($account->uid, FALSE); $url = "{$base_path}account/{$account->uid}"; if (empty($title)) { $title = $account->name; @@ -162,4 +162,4 @@ -'. check_plain(print_r($info_split, 1)) .''; ?> \ No newline at end of file +'. check_plain(print_r($info_split, 1)) .''; ?>