Merge pull request #322 from openclassify/vedat

add with trashed parameter

addons/default/visiosoft/advs-module/src/Adv/AdvModel.php

@@ -59,18 +59,26 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
         return 1;
     }
 
-    public function getAdv($id = null, $nullable_ad = false)
+    public function getAdv($id = null, $nullable_ad = false, $trashed = false)
     {
-        if ($id != null) {
+        $query = $this::query();
-            if ($nullable_ad)
+
-                return $this->find($id);
+        if ($trashed) {
-            else
+            $query = $this::withTrashed();
-                return $this->where('advs_advs.slug', '!=', "")
-                    ->find($id);
         }
-        if ($nullable_ad)
+
-            return $this->newQuery();
+        if ($id != null) {
-        return $this->where('advs_advs.slug', '!=', "");
+            if ($nullable_ad) {
+                return $query->find($id);
+            } else {
+                return $query->where('advs_advs.slug', '!=', "")
+                    ->find($id);
+            }
+        }
+        if ($nullable_ad) {
+            return $query->newQuery();
+        }
+        return $query->where('advs_advs.slug', '!=', "");
     }
 
     public function userAdv($nullable_ad = false)