summaryrefslogtreecommitdiff
path: root/includes/account.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-06-04 22:48:03 +0200
committerMichael Tänzer <neo@nhng.de>2013-06-04 22:48:03 +0200
commitd2ad5c5c27f4daeabd3f53268cdeab2b706e6e97 (patch)
tree19cc6acef2edbb5261c49474db2fed9ee38aa47f /includes/account.php
parentd26f9abb0a6e119250c42811e4b2f60aedf010a6 (diff)
parentde583d9e02a9395c6508301f36a3fa021103818d (diff)
downloadcacert-devel-d2ad5c5c27f4daeabd3f53268cdeab2b706e6e97.tar.gz
cacert-devel-d2ad5c5c27f4daeabd3f53268cdeab2b706e6e97.tar.xz
cacert-devel-d2ad5c5c27f4daeabd3f53268cdeab2b706e6e97.zip
Merge branch 'bug-922' into release
Diffstat (limited to 'includes/account.php')
-rw-r--r--includes/account.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/includes/account.php b/includes/account.php
index 05b07a7..4aed5ed 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -625,13 +625,14 @@
echo $row['domain']."<br>\n";
$dres = mysql_query(
- "select distinct `domaincerts`.`id`
- from `domaincerts`, `domlink`
+ "select `domaincerts`.`id`
+ from `domaincerts`
where `domaincerts`.`domid` = '$id'
- or (
- `domaincerts`.`id` = `domlink`.`certid`
- and `domlink`.`domid` = '$id'
- )");
+ union distinct
+ select `domaincerts`.`id`
+ from `domaincerts`, `domlink`
+ where `domaincerts`.`id` = `domlink`.`certid`
+ and `domlink`.`domid` = '$id'");
while($drow = mysql_fetch_assoc($dres))
{
mysql_query(