Fixed checks related with getting model in TreeController

arogachev · arogachev · commit e089592ab61c · 2015-05-05T10:26:25.000+06:00
diff --git a/src/controllers/TreeController.php b/src/controllers/TreeController.php
@@ -129,13 +129,13 @@ protected function getModel($paramName = null, $createIfNotFound = false)
             throw new BadRequestHttpException('Model primary key must be specified in order to find model.');
         }
 
-        if (!$createIfNotFound) {
-            $model = $modelClass::findOne($pk);
-            if (!$model) {
+        $model = $modelClass::findOne($pk);
+        if (!$model) {
+            if (!$createIfNotFound) {
                 throw new NotFoundHttpException('Model not found.');
+            } else {
+                $model = new $modelClass;
             }
-        } else {
-            $model = new $modelClass;
         }
 
         if (!($model instanceof ActiveRecord)) {

Original file line number	Diff line number	Diff line change
`@@ -129,13 +129,13 @@ protected function getModel($paramName = null, $createIfNotFound = false)`
`129`	`129`	`throw new BadRequestHttpException('Model primary key must be specified in order to find model.');`
`130`	`130`	`}`
`131`	`131`
`132`		`- if (!$createIfNotFound) {`
`133`		`- $model = $modelClass::findOne($pk);`
`134`		`- if (!$model) {`
	`132`	`+ $model = $modelClass::findOne($pk);`
	`133`	`+ if (!$model) {`
	`134`	`+ if (!$createIfNotFound) {`
`135`	`135`	`throw new NotFoundHttpException('Model not found.');`
	`136`	`+ } else {`
	`137`	`+ $model = new $modelClass;`
`136`	`138`	`}`
`137`		`- } else {`
`138`		`- $model = new $modelClass;`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`if (!($model instanceof ActiveRecord)) {`