gnh1201/reasonableframework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update base.php

Browse Source
This commit is contained in:
Namhyeon Go 2019-02-23 02:53:58 +09:00 committed by GitHub
parent ebc5233e26
commit b60bb75b31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
system/base.php
View File

@ -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;
}