Merge branch '3.0' into 3

silverstripe · Sep 17, 2018 · 265b948 · 265b948
2 parents 0ad6e11 + c6e68e5
commit 265b948
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Models/BaseElement.php b/src/Models/BaseElement.php
@@ -309,7 +309,7 @@ public function getCMSFields()
             }
 
             // Support for new history viewer in SS 4.2+
-            if (class_exists(HistoryViewerField::class)) {
+            if ($this->isInDB() && class_exists(HistoryViewerField::class)) {
                 Requirements::javascript('dnadesign/silverstripe-elemental:client/dist/js/bundle.js');
 
                 $historyViewer = HistoryViewerField::create('ElementHistory');

diff --git a/src/Models/ElementalArea.php b/src/Models/ElementalArea.php
@@ -167,7 +167,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_by_stage($class, $currentStage)->filter($areaID, $this->ID)->first();
 
                 if ($page) {
                     $this->cacheData['owner_page'] = $page;
@@ -185,7 +185,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_by_stage($class, Versioned::DRAFT)->filter($areaID, $this->ID)->first();
 
                 if ($page) {
                     if ($this->OwnerClassName !== $class) {