FIX Ensure Versioned query has table name prefix so it will work with…

… modules like fluent
silverstripe · Sep 10, 2018 · 7583b4c · 7583b4c
1 parent 0e3c17a
commit 7583b4c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Models/ElementalArea.php b/src/Models/ElementalArea.php
@@ -157,6 +157,7 @@ public function getOwnerPage()
 
         if ($this->OwnerClassName) {
             $class = $this->OwnerClassName;
+            $tableName = DataObject::getSchema()->tableName($class);
             $instance = Injector::inst()->get($class);
             if (!ClassInfo::hasMethod($instance, 'getElementalRelations')) {
                 return null;
@@ -167,7 +168,7 @@ public function getOwnerPage()
                 $areaID = $eaRelationship . 'ID';
 
                 $currentStage = Versioned::get_stage() ?: Versioned::DRAFT;
-                $page = Versioned::get_one_by_stage($class, $currentStage, "\"$areaID\" = {$this->ID}");
+                $page = Versioned::get_one_by_stage($class, $currentStage, "\"$tableName\".\"$areaID\" = {$this->ID}");
 
                 if ($page) {
                     $this->cacheData['owner_page'] = $page;
@@ -177,6 +178,7 @@ public function getOwnerPage()
         }
 
         foreach ($this->supportedPageTypes() as $class) {
+            $tableName = DataObject::getSchema()->tableName($class);
             $instance = Injector::inst()->get($class);
             if (!ClassInfo::hasMethod($instance, 'getElementalRelations')) {
                 return null;
@@ -185,7 +187,7 @@ public function getOwnerPage()
 
             foreach ($elementalAreaRelations as $eaRelationship) {
                 $areaID = $eaRelationship . 'ID';
-                $page = Versioned::get_one_by_stage($class, Versioned::DRAFT, "\"$areaID\" = {$this->ID}");
+                $page = Versioned::get_one_by_stage($class, Versioned::DRAFT, "\"$tableName\".\"$areaID\" = {$this->ID}");
 
                 if ($page) {
                     if ($this->OwnerClassName !== $class) {