diff options
| author | Michael Tänzer <neo@nhng.de> | 2014-04-29 16:13:59 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2014-04-29 16:13:59 +0200 |
| commit | bb11f3a0645a6b96767c9c318fa239a12c3351e5 (patch) | |
| tree | 2dba41fa37855e6f1165c89d91c04c1bc18d6f3d /pages/account/55.php | |
| parent | 4f555bd41ae6340c21f199512090e1e47d08fa3a (diff) | |
| parent | 1a119ab85f3bd5b352223ceef6ba8f29151130b2 (diff) | |
| download | cacert-devel-bb11f3a0645a6b96767c9c318fa239a12c3351e5.tar.gz cacert-devel-bb11f3a0645a6b96767c9c318fa239a12c3351e5.tar.xz cacert-devel-bb11f3a0645a6b96767c9c318fa239a12c3351e5.zip | |
Merge branch 'bug-1221' into bug-1138
Conflicts:
includes/account.php
includes/general.php
includes/loggedin.php
includes/notary.inc.php
pages/account/43.php
pages/account/55.php
pages/wot/10.php
www/index.php
www/wot.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages/account/55.php')
| -rw-r--r-- | pages/account/55.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pages/account/55.php b/pages/account/55.php index 38e9fb7..7e9710c 100644 --- a/pages/account/55.php +++ b/pages/account/55.php @@ -87,7 +87,7 @@ <tr><td colspan="3" class="DataTD"><a href="account.php?id=43&userid=<?=$user_id ?>">back</a></td></tr>
<? } else {
$query = 'SELECT `u`.id, `u`.`assurer`, SUM(`points`) FROM `users` AS `u`, `notary` AS `n` '.
- ' WHERE `u`.`id` = \''.(int)intval($_SESSION['profile']['id']).'\' AND `n`.`to` = `u`.`id` AND `expire` < now() '.
+ ' WHERE `u`.`id` = \''.(int)intval($_SESSION['profile']['id']).'\' AND `n`.`to` = `u`.`id` AND `expire` < now() and and `n`.`deleted` = 0'. ' GROUP BY `u`.id, `u`.`assurer`';
$res = mysql_query($query);
if (!$res) {
|