Merge pull request #3182 from hirakujira/master

Fix filter fallback doesn't work issue

Author: tabacitu

src/app/Library/CrudPanel/CrudFilter.php

@@ -106,6 +106,11 @@ public function apply($input = null)
         $input = $input ?? new ParameterBag($this->crud()->getRequest()->all());
 
         if (! $input->has($this->name)) {
+            // if fallback logic was supplied and is a closure
+            if (is_callable($this->fallbackLogic)) {
+                return ($this->fallbackLogic)();
+            }
+
             return;
         }
 
@@ -115,11 +120,6 @@ public function apply($input = null)
         } else {
             return $this->applyDefaultLogic($this->name, false);
         }
-
-        // if fallback logic was supplied and is a closure
-        if (is_callable($this->fallbackLogic)) {
-            return ($this->fallbackLogic)();
-        }
     }
 
     /**