MINOR Quoting relation tables in new ManyManyList API

silverstripe · Oct 7, 2011 · 0a8a178 · 0a8a178
1 parent df56eb5
commit 0a8a178
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/model/ManyManyList.php b/model/ManyManyList.php
@@ -113,7 +113,7 @@ function remove($item) {
 	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 @@ function removeByID($itemID) {
      * @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
@@ -1412,7 +1412,7 @@ public function setForeignID($id) {
 
 		// 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();