Merge pull request #3154 from mgralikowski/patch-2

yajra · web-flow · commit b0f11778502a · 2024-07-03T21:49:19.000+08:00
fix: ErrorException when direction is null
diff --git a/src/Utilities/Request.php b/src/Utilities/Request.php
@@ -86,7 +86,7 @@ public function orderableColumns(): array
             /** @var string $direction */
             $direction = $this->request->input("order.$i.dir");
 
-            $order_dir = strtolower($direction) === 'asc' ? 'asc' : 'desc';
+            $order_dir = $direction && strtolower($direction) === 'asc' ? 'asc' : 'desc';
             if ($this->isColumnOrderable($order_col)) {
                 $orderable[] = ['column' => $order_col, 'direction' => $order_dir];
             }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function orderableColumns(): array`
`86`	`86`	`/** @var string $direction */`
`87`	`87`	`$direction = $this->request->input("order.$i.dir");`
`88`	`88`
`89`		`- $order_dir = strtolower($direction) === 'asc' ? 'asc' : 'desc';`
	`89`	`+ $order_dir = $direction && strtolower($direction) === 'asc' ? 'asc' : 'desc';`
`90`	`90`	`if ($this->isColumnOrderable($order_col)) {`
`91`	`91`	`$orderable[] = ['column' => $order_col, 'direction' => $order_dir];`
`92`	`92`	`}`