Merge branch 'main' of github.com:webman-php/admin

walkor · walkor · commit 56641908ac96 · 2023-06-07T17:18:17.000+08:00
diff --git a/src/plugin/admin/app/common/Tree.php b/src/plugin/admin/app/common/Tree.php
@@ -168,7 +168,7 @@ public static function arrayValues($array): array
         }
         if (!isset($array['children'])) {
             $current = current($array);
-            if (!is_array($current) || !isset($current['children'])) {
+            if (!is_array($current)) {
                 return $array;
             }
             $tree = array_values($array);

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public static function arrayValues($array): array`
`168`	`168`	`}`
`169`	`169`	`if (!isset($array['children'])) {`
`170`	`170`	`$current = current($array);`
`171`		`- if (!is_array($current) \|\| !isset($current['children'])) {`
	`171`	`+ if (!is_array($current)) {`
`172`	`172`	`return $array;`
`173`	`173`	`}`
`174`	`174`	`$tree = array_values($array);`