From 32e1695a676cf756ead0179997e5780eb0b970fc Mon Sep 17 00:00:00 2001 From: Shawn Kwang Date: Fri, 3 Feb 2017 10:41:41 -0600 Subject: [PATCH 1/2] Drupal: Fixes PHP error due to wrong object/array call. --- .../boinc/modules/boincuser/includes/boincuser.forms.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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']); From 6331b931baba6fcef8ee07195415c730516a5056 Mon Sep 17 00:00:00 2001 From: Shawn Kwang Date: Wed, 8 Feb 2017 14:49:34 -0600 Subject: [PATCH 2/2] Drupal: Search result should return user profile image. (Not community avatar.) --- .../boinc/themes/boinc/templates/search-result.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)) .''; ?>