From b60bb75b312a6dd30d4b882d40c5eecb318d3321 Mon Sep 17 00:00:00 2001 From: "Namhyeon, Go" Date: Sat, 23 Feb 2019 02:53:58 +0900 Subject: [PATCH] Update base.php --- system/base.php | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/system/base.php b/system/base.php index 0c35394..368c4ce 100644 --- a/system/base.php +++ b/system/base.php @@ -124,36 +124,13 @@ if(!function_exists("loadRoute")) { $flag = true; $routes = explode(";", $name); foreach($routes as $name2) { - $routefile = './route/' . $name2. '.php'; - if(!file_exists($routefile)) { + $routefile = './route/' . $name2 . '.php'; + if(file_exists($routefile)) { + register_loaded("route", $name2); + $flag = $flag && !include_isolate($routefile, $data); + } else { set_error("Route " . $name . "dose not exists"); } - - $routes = explode("/", $name2); - $current_routes = array(); - foreach($routes as $name3) { - $current_routes[] = $name3; - $route_name = implode("/", $current_routes); - $routefile = './route/' . $route_name . '.php'; - if(file_exists($routefile)) { - register_loaded("route", $route_name); - - $route_scope = get_scope("route/" . $route_name); - if(is_array($route_scope)) { - foreach($route_scope as $k=>$v) { - $data[$k] = $v; - } - } - - if($name2 == $route_name) { - $flag = $flag && !include_isolate($routefile, $data); - } else { - include_isolate($routefile, $data); - } - } - } - - } return !$flag; }