Fixes laravel#37660

It was my first time cherry picking commits and just saw that i've made #baefe52 my own, which is not, sorry!
Javdu10 · Jun 11, 2021 · 6cd11b8 · 6cd11b8
1 parent 93f43e0
commit 6cd11b8
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
@@ -1988,6 +1988,11 @@ public function orderBy($column, $direction = 'asc')
         if (is_array($this->{$ordersProperty})) {
             foreach ($this->{$ordersProperty} as $key => $value) {
                 if (isset($value['column']) && $value['column'] === $column) {
+                    $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6);
+
+                    if($trace[5]['function'] === 'callScope')
+                        return $this;
+
                     $this->{$ordersProperty}[$key]['direction'] = $direction;
 
                     return $this;