From 0a8a17833ff386089bf117c4508b057a725819dd Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 7 Oct 2011 14:11:07 +0200 Subject: [PATCH] MINOR Quoting relation tables in new ManyManyList API --- model/ManyManyList.php | 4 ++-- security/Member.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/model/ManyManyList.php b/model/ManyManyList.php index 5faee849d..41e2e3385 100644 --- a/model/ManyManyList.php +++ b/model/ManyManyList.php @@ -113,7 +113,7 @@ class ManyManyList extends RelationList { function removeByID($itemID) { if(!is_numeric($itemID)) throw new InvalidArgumentException("ManyManyList::removeById() expecting an ID"); - $query = new SQLQuery("*", array($this->joinTable)); + $query = new SQLQuery("*", array("\"$this->joinTable\"")); $query->delete = true; if($filter = $this->foreignIDFilter()) { @@ -131,7 +131,7 @@ class ManyManyList extends RelationList { * @deprecated this is experimental and will change. Don't use it in your projects. */ function removeByFilter($filter) { - $query = new SQLQuery("*", array($this->joinTable)); + $query = new SQLQuery("*", array("\"$this->joinTable\"")); $query->delete = true; $query->where($filter); $query->execute(); diff --git a/security/Member.php b/security/Member.php index 29590bdf8..373d34462 100644 --- a/security/Member.php +++ b/security/Member.php @@ -1412,7 +1412,7 @@ class Member_GroupSet extends ManyManyList { // Find directly applied groups $manymanyFilter = $this->foreignIDFilter(); - $groupIDs = DB::query('SELECT "GroupID" FROM Group_Members WHERE ' . $manymanyFilter)->column(); + $groupIDs = DB::query('SELECT "GroupID" FROM "Group_Members" WHERE ' . $manymanyFilter)->column(); // Get all ancestors $allGroupIDs = array();