summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-04-30 00:25:31 +0200
committerBenny Baumann <BenBE@geshi.org>2015-04-30 00:25:31 +0200
commit6c68caa8d2679675721f3e8ba2210f6ce8f491f1 (patch)
tree8a4e598e249747afae34795aea0fb14b7be30b9f
parent8b7a12b799f5a323f7ce08fe6c9479c81e48565a (diff)
parentf2a909d694c7039d6a405e71674f325e2ddffc3e (diff)
downloadcacert-devel-6c68caa8d2679675721f3e8ba2210f6ce8f491f1.tar.gz
cacert-devel-6c68caa8d2679675721f3e8ba2210f6ce8f491f1.tar.xz
cacert-devel-6c68caa8d2679675721f3e8ba2210f6ce8f491f1.zip
Merge branch 'bug-1058' into bug-1042
-rw-r--r--pages/account/55.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/pages/account/55.php b/pages/account/55.php
index 24cc86d..1f01771 100644
--- a/pages/account/55.php
+++ b/pages/account/55.php
@@ -90,10 +90,11 @@
$query = '
SELECT `u`.`id`,
`u`.`assurer`,
- SUM(`points`)
+ SUM(`awarded`)
FROM `users` AS `u`,
`notary` AS `n`
WHERE `u`.`id` = \''.intval($_SESSION['profile']['id']).'\'
+ AND `n`.`method` != 'Administrative Increase' AND `n`.`from` != `n`.`to`
AND `n`.`to` = `u`.`id`
AND `expire` < NOW()
AND `n`.`deleted` = 0