summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-04-21 21:17:30 +0200
committerBenny Baumann <BenBE@geshi.org>2015-04-21 21:17:30 +0200
commitb9e6aed009ce835560f37c338163f59e38493da1 (patch)
tree63480c8f9558d9e8dbcfef6ef8c6ec850e2c5514
parente5c1944a8d16b611bb70215920e4633339d6c105 (diff)
parente12f929ab962e023f613a7411e49ebbbaad4700a (diff)
downloadcacert-devel-b9e6aed009ce835560f37c338163f59e38493da1.tar.gz
cacert-devel-b9e6aed009ce835560f37c338163f59e38493da1.tar.xz
cacert-devel-b9e6aed009ce835560f37c338163f59e38493da1.zip
Merge branch 'bug-1046' into bug-1042
-rw-r--r--includes/lib/account.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/lib/account.php b/includes/lib/account.php
index dd8afd3..6e17dda 100644
--- a/includes/lib/account.php
+++ b/includes/lib/account.php
@@ -48,8 +48,8 @@ function fix_assurer_flag($userID = NULL)
AND `cp`.`user_id` = `u`.`id`
)
AND (
- SELECT SUM(`points`) FROM `notary` AS `n`
- WHERE `n`.`to` = `u`.`id`
+ SELECT SUM(`awarded`) FROM `notary` AS `n`
+ 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
@@ -81,8 +81,8 @@ function fix_assurer_flag($userID = NULL)
AND `cp`.`user_id` = `u`.`id`
)
OR (
- SELECT SUM(`points`) FROM `notary` AS `n`
- WHERE `n`.`to` = `u`.`id`
+ SELECT SUM(`awarded`) FROM `notary` AS `n`
+ WHERE `n`.`to` = `u`.`id` AND `n`.`method` != 'Administrative Increase' AND `n`.`from` != `n`.`to`
AND (
`n`.`expire` > now()
OR `n`.`expire` IS NULL