From 6744dcf1b1ce1da56498d25e837ceebc693a0bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Tue, 6 Aug 2013 23:37:06 +0200 Subject: bug 1136: Use optimised SQL query from bug #922 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- includes/notary.inc.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/includes/notary.inc.php b/includes/notary.inc.php index 1ca6ba1..5fd64f1 100644 --- a/includes/notary.inc.php +++ b/includes/notary.inc.php @@ -1005,12 +1005,15 @@ function revoke_all_server_cert($domainid){ //revokes all server certs for an domain $domainid = intval($domainid); - $query = "select distinct `domaincerts`.`id` - from `domaincerts`, `domlink` - where `domaincerts`.`domid` = '$domainid' - or ( - `domaincerts`.`id` = `domlink`.`certid` - and `domlink`.`domid` = '$domainid')"; + $query = + "select `domaincerts`.`id` + from `domaincerts` + where `domaincerts`.`domid` = '$domainid' + union distinct + select `domaincerts`.`id` + from `domaincerts`, `domlink` + where `domaincerts`.`id` = `domlink`.`certid` + and `domlink`.`domid` = '$domainid'"; $dres = mysql_query($query); while($drow = mysql_fetch_assoc($dres)) { -- cgit v1.2.1