Merge branch '2.0' into 3.0

robbieaverill · robbieaverill · commit d36654300735 · 2019-04-21T11:12:30.000+12:00
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;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,10 @@ protected function typeName()`
`51`	`51`	`*/`
`52`	`52`	`public function getDataObjectInstance()`
`53`	`53`	`{`
`54`		`- if ($this->dataObjectInstance) {`
`55`		`- return $this->dataObjectInstance;`
	`54`	`+ if (!$this->dataObjectInstance) {`
	`55`	`+ $this->dataObjectInstance = Injector::inst()->get($this->dataObjectClass);`
`56`	`56`	`}`
`57`		`-`
`58`		`- return $this->dataObjectInstance = Injector::inst()->get($this->dataObjectClass);`
	`57`	`+ return $this->dataObjectInstance;`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`/**`