diff options
| author | Benny Baumann <BenBE@geshi.org> | 2015-05-05 19:09:30 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2015-05-05 19:09:30 +0200 |
| commit | 70f867dca49fa2f999470913ff75f816bcbb700d (patch) | |
| tree | e8907b51235fe0c5e9d3d95defa61c685d5221b9 /pages/account | |
| parent | aaffd10f8439c32bfbb8bfca83c08f98f23fb2c9 (diff) | |
| parent | 77ed5c5b06c2dc8fafc74c1be5a6197bb45e0f11 (diff) | |
| download | cacert-devel-70f867dca49fa2f999470913ff75f816bcbb700d.tar.gz cacert-devel-70f867dca49fa2f999470913ff75f816bcbb700d.tar.xz cacert-devel-70f867dca49fa2f999470913ff75f816bcbb700d.zip | |
Merge branch 'bug-1042' into testserver-stable
Diffstat (limited to 'pages/account')
| -rw-r--r-- | pages/account/55.php | 3 |
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 |