Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:BOINC/boinc

This commit is contained in:
David Anderson 2017-02-12 00:49:19 -08:00
parent 1e0631dc87 25693388e9
commit cd1f2f6176
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drupal/sites/default/boinc/modules/boincuser/includes/boincuser.forms.inc
View File

@ -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']);

4
drupal/sites/default/boinc/themes/boinc/templates/search-result.tpl.php
View File

@ -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 @@
</dd>
</div>
<?php endswitch; ?>
<?php //print '<pre>'. check_plain(print_r($info_split, 1)) .'</pre>'; ?>
<?php //print '<pre>'. check_plain(print_r($info_split, 1)) .'</pre>'; ?>