Merge branch 'bug-922' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 4 Jun 2013 20:48:03 +0000 (22:48 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 4 Jun 2013 20:48:03 +0000 (22:48 +0200)
1  2 
includes/account.php

                                {
                                        $row = mysql_fetch_assoc($res);
                                        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(