Merge pull request #148 from creative-commoners/pulls/2.0/set-then-re…

…turn MINOR Switch logic in getDataObjectInstance to be slightly more readable
silverstripe · Jan 9, 2019 · c58711c · c58711c
2 parents 03248c4 + 7188362
commit c58711c
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/Scaffolding/Traits/DataObjectTypeTrait.php b/src/Scaffolding/Traits/DataObjectTypeTrait.php
@@ -51,11 +51,10 @@ protected function typeName()
      */
     public function getDataObjectInstance()
     {
-        if ($this->dataObjectInstance) {
-            return $this->dataObjectInstance;
+        if (!$this->dataObjectInstance) {
+            $this->dataObjectInstance = Injector::inst()->get($this->dataObjectClass);
         }
-
-        return $this->dataObjectInstance = Injector::inst()->get($this->dataObjectClass);
+        return $this->dataObjectInstance;
     }
 
     /**