From bc84d1bb272d40a9b525905dba6a1bac265615e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 13 Feb 2017 18:08:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Menu.php | 4 +---
 extend/library/Tools.php              | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index 59757b297..4ff62855b 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -52,9 +52,7 @@ class Menu extends BasicAdmin {
      */
     protected function _index_data_filter(&$data) {
         foreach ($data as &$vo) {
-            if ($vo['url'] !== '#') {
-                $vo['url'] = url($vo['url']);
-            }
+            ($vo['url'] !== '#') && ($vo['url'] = url($vo['url']));
             $vo['ids'] = join(',', Tools::getArrSubIds($data, $vo['id']));
         }
         $data = Tools::arr2table($data);
diff --git a/extend/library/Tools.php b/extend/library/Tools.php
index bde044749..91663a4ce 100644
--- a/extend/library/Tools.php
+++ b/extend/library/Tools.php
@@ -57,7 +57,7 @@ class Tools {
             $tree[] = $_tree;
             if (!empty($sub)) {
                 $sub_array = self::arr2table($sub, $id, $pid, $path, $_tree[$path]);
-                $tree = array_merge($tree, (Array) $sub_array);
+                $tree = array_merge($tree, (Array)$sub_array);
             }
         }
         return $tree;
@@ -103,7 +103,7 @@ class Tools {
             $tree[] = $_tree;
             if (!empty($sub)) {
                 $sub_array = self::node2table($sub, $node, $pnode, $path, $_tree[$path . "_node"]);
-                $tree = array_merge($tree, (Array) $sub_array);
+                $tree = array_merge($tree, (Array)$sub_array);
             }
         }
         return $tree;