Merge pull request #169 from morphet81/master

Fix bug #93 completing Tamrael's modification
nicolaslopezj · Jun 21, 2018 · 55b26c0 · 55b26c0
2 parents 831cf32 + e7abed4
commit 55b26c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/src/SearchableTrait.php b/src/SearchableTrait.php
@@ -322,11 +322,14 @@ protected function mergeQueries(Builder $clone, Builder $original) {
             $original->from(DB::connection($this->connection)->raw("({$clone->toSql()}) as `{$tableName}`"));
         }
 
-        $original->setBindings(
-            array_merge_recursive(
-                $clone->getBindings(),
-                $original->getBindings()
-            )
+        // First create a new array merging bindings
+        $mergedBindings = array_merge_recursive(
+            $clone->getBindings(),
+            $original->getBindings()
         );
+
+        // Then apply bindings WITHOUT global scopes which are already included. If not, there is a strange behaviour
+        // with some scope's bindings remaning
+        $original->withoutGlobalScopes()->setBindings($mergedBindings);
     }
 }