From dce64a567f814542fc5eb556e64a87b5eb664078 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Tue, 9 Mar 2010 01:42:56 +0000 Subject: [PATCH] BUGFIX Fixed Subsite::hasMainSitePermission() SQL query, removed use of USING() and rely on standard INNER JOIN ON syntax that works on all databases --- code/Subsite.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/Subsite.php b/code/Subsite.php index 3d7afb6..cd81599 100644 --- a/code/Subsite.php +++ b/code/Subsite.php @@ -361,9 +361,8 @@ JS; SELECT COUNT(\"Permission\".\"ID\") FROM \"Permission\" INNER JOIN \"Group\" ON \"Group\".\"ID\" = \"Permission\".\"GroupID\" AND \"Group\".\"AccessAllSubsites\" = 1 - INNER JOIN \"Group_Members\" USING(\"GroupID\") - WHERE - \"Permission\".\"Code\" IN ('$SQL_perms') + INNER JOIN \"Group_Members\" ON \"Group_Members\".\"GroupID\" = \"Permission\".\"GroupID\" + WHERE \"Permission\".\"Code\" IN ('$SQL_perms') AND \"MemberID\" = {$memberID} ")->value();