Merge pull request #3098 from sangnguyenplus/master

yajra · web-flow · commit 928011eef82f · 2023-11-25T20:59:06.000+08:00
fix: Prevent error when PHP extension iconv not enabled.
diff --git a/src/QueryDataTable.php b/src/QueryDataTable.php
@@ -863,7 +863,7 @@ protected function showDebugger(array $output): array
     {
         $query_log = $this->getConnection()->getQueryLog();
         array_walk_recursive($query_log, function (&$item) {
-            if (is_string($item)) {
+            if (is_string($item) && extension_loaded('iconv')) {
                 $item = iconv('iso-8859-1', 'utf-8', $item);
             }
         });

Original file line number	Diff line number	Diff line change
`@@ -863,7 +863,7 @@ protected function showDebugger(array $output): array`
`863`	`863`	`{`
`864`	`864`	`$query_log = $this->getConnection()->getQueryLog();`
`865`	`865`	`array_walk_recursive($query_log, function (&$item) {`
`866`		`- if (is_string($item)) {`
	`866`	`+ if (is_string($item) && extension_loaded('iconv')) {`
`867`	`867`	`$item = iconv('iso-8859-1', 'utf-8', $item);`
`868`	`868`	`}`
`869`	`869`	`});`