summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-05-05 20:06:43 +0200
committerBenny Baumann <BenBE@geshi.org>2015-05-05 20:06:43 +0200
commit6cc7ca38ba1bb93c3ac47a67c31fc113c98ea0f1 (patch)
tree4a27a21a15d71db98d808fc7758fd71ac29a9a68
parent25e0ce70531e75e5476ecf32ffce9a3423e21173 (diff)
parent34a3e15411f7fe0cafc0a879d187671efa6b8829 (diff)
downloadcacert-devel-6cc7ca38ba1bb93c3ac47a67c31fc113c98ea0f1.tar.gz
cacert-devel-6cc7ca38ba1bb93c3ac47a67c31fc113c98ea0f1.tar.xz
cacert-devel-6cc7ca38ba1bb93c3ac47a67c31fc113c98ea0f1.zip
Merge branch 'bug-1042' into testserver-stable
-rw-r--r--includes/lib/account.php4
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