diff options
| author | Benny Baumann <BenBE@geshi.org> | 2015-05-05 20:06:33 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2015-05-05 20:06:33 +0200 |
| commit | 34a3e15411f7fe0cafc0a879d187671efa6b8829 (patch) | |
| tree | 29103b291b4fc51b58b42917a65014e97452d052 /includes | |
| parent | e74827482a4aae0629c252275745e46fcd735d71 (diff) | |
| parent | 80d3a9af2c566fc5a041458b38c3a7fca00aaebf (diff) | |
| download | cacert-devel-34a3e15411f7fe0cafc0a879d187671efa6b8829.tar.gz cacert-devel-34a3e15411f7fe0cafc0a879d187671efa6b8829.tar.xz cacert-devel-34a3e15411f7fe0cafc0a879d187671efa6b8829.zip | |
Merge branch 'bug-1046' into bug-1042
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/lib/account.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/lib/account.php b/includes/lib/account.php index 6e17dda..f9c1399 100644 --- a/includes/lib/account.php +++ b/includes/lib/account.php @@ -49,7 +49,7 @@ function fix_assurer_flag($userID = NULL) ) AND ( SELECT SUM(`awarded`) FROM `notary` AS `n` - WHERE `n`.`to` = `u`.`id` AND `n`.`method` != 'Administrative Increase' AND `n`.`from` != `n`.`to` + WHERE `n`.`to` = `u`.`id` AND `n`.`method` != \'Administrative Increase\' AND `n`.`from` != `n`.`to` AND (`n`.`expire` > now() OR `n`.`expire` IS NULL) AND `n`.`deleted` = 0 @@ -82,7 +82,7 @@ function fix_assurer_flag($userID = NULL) ) OR ( SELECT SUM(`awarded`) FROM `notary` AS `n` - WHERE `n`.`to` = `u`.`id` AND `n`.`method` != 'Administrative Increase' AND `n`.`from` != `n`.`to` + WHERE `n`.`to` = `u`.`id` AND `n`.`method` != \'Administrative Increase\' AND `n`.`from` != `n`.`to` AND ( `n`.`expire` > now() OR `n`.`expire` IS NULL |