Update BeforeQueryTrait.php

sibds · Mar 6, 2016 · 6b65970 · 6b65970
1 parent 6993dc0
commit 6b65970
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/BeforeQueryTrait.php b/BeforeQueryTrait.php
@@ -18,8 +18,11 @@ public static function find()
                 $condition = array_merge($condition, $property->getValue($obj));
             }
         }
-        if($obj->hasAttribute($obj->removedAttribute))
-            return  (new \sibds\behaviors\TrashQuery($obj))->findRemoved()->andFilterWhere($condition);
+
+        if ($obj->hasAttribute($obj->removedAttribute))
+            return (new DynamicQuery($obj))->findRemoved()->andFilterWhere($condition);
+        elseif ($obj->isNestedSet())
+            return (new DynamicQuery($obj))->andFilterWhere($condition);
         else
             return parent::find()->andFilterWhere($condition);
     }