summaryrefslogtreecommitdiff
path: root/includes/lib
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-03-28 23:35:54 +0200
committerMichael Tänzer <neo@nhng.de>2012-03-28 23:35:54 +0200
commit02d307527b6797e8dd6f6117b8ff24707d007137 (patch)
tree8235c0241681f92203cdc51f8b310a7a9f2e6912 /includes/lib
parentd4bd109238aec503ad1d8abc1cd12ad8a12bba46 (diff)
parentb9d60cb4824796dc85d60e672d076ae25e534682 (diff)
downloadcacert-devel-02d307527b6797e8dd6f6117b8ff24707d007137.tar.gz
cacert-devel-02d307527b6797e8dd6f6117b8ff24707d007137.tar.xz
cacert-devel-02d307527b6797e8dd6f6117b8ff24707d007137.zip
Merge branch 'release' into bug-1024
Conflicts: includes/lib/account.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes/lib')
-rw-r--r--includes/lib/account.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/lib/account.php b/includes/lib/account.php
index 2c3fffa..4d427d5 100644
--- a/includes/lib/account.php
+++ b/includes/lib/account.php
@@ -34,7 +34,7 @@ function fix_assurer_flag($userID)
if (!$query) {
return false;
}
-
+
// Reset flag if requirements are not met
$sql = 'UPDATE `users` AS `u` SET `assurer` = 0 WHERE
`u`.`id` = \''.(int)intval($userID).'\' AND