File tree Expand file tree Collapse file tree 2 files changed +7
-11
lines changed
Expand file tree Collapse file tree 2 files changed +7
-11
lines changed Original file line number Diff line number Diff line change @@ -296,16 +296,6 @@ public function applyScopes()
296296 {
297297 $ builder = parent ::applyScopes ();
298298
299- $ query = $ builder ->getQuery ();
300-
301- foreach ($ query ->wheres as $ index => $ find ) {
302- if (! empty ($ find )) {
303- continue ;
304- }
305-
306- unset($ query ->wheres [$ index ]);
307- }
308-
309299 return $ builder ;
310300 }
311301
Original file line number Diff line number Diff line change @@ -254,6 +254,12 @@ public function performFind(FMBaseBuilder $query)
254254 $ query ->limit = self ::CRAZY_RECORDS_AMOUNT ;
255255 }
256256
257+ // remove any empty arrays from wheres
258+ // an empty find is invalid
259+ $ query ->wheres = collect ($ query ->wheres )->filter (function ($ item ) {
260+ return is_array ($ item ) ? count ($ item ) > 0 : true ;
261+ })->toArray ();
262+
257263 // if there are no query parameters we need to do a get all records instead of a find
258264 if (empty ($ query ->wheres ) && ! $ query ->isForcingHighOffset ()) {
259265 return $ this ->getRecords ($ query );
@@ -511,7 +517,7 @@ public function buildPostDataFromQuery(FMBaseBuilder $query)
511517 foreach ($ params as $ attribute => $ request ) {
512518 $ value = $ query ->$ attribute ;
513519
514- // just skip everything else if the value is null
520+ // just skip everything else if the value is null
515521 if ($ value === null ) {
516522 continue ;
517523 }
You can’t perform that action at this time.
0 commit comments