fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect URL in admin header

Browse source
This commit is contained in:
Kijin Sung 2020-07-02 14:29:18 +09:00
parent 4febc5df88
commit 54375d16ad
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
classes/context/Context.class.php
View file

@ -1705,6 +1705,7 @@ class Context
// If $args_list contains one array, reset existing parameters and use keys & values from $args_list.
if (is_array($args_list[0]) && count($args_list) == 1)
{
$get_vars = array();
foreach ($args_list[0] as $key => $val)
{
$val = trim($val);

9
common/framework/router.php
View file

@ -350,7 +350,8 @@ class Router
if ($result !== false)
{
self::$_route_cache[$rewrite_level][$keys_string] = '$' . $prefix_type . '/' . $result . '$act:delete';
return $args[$prefix_type] . '/' . self::_insertRouteVars($result, $args2);
$internal_url = self::_insertRouteVars($result, $args2);
return $args[$prefix_type] . ($internal_url ? ('/' . $internal_url) : '');
}
}
@ -364,7 +365,8 @@ class Router
if ($result !== false)
{
self::$_route_cache[$rewrite_level][$keys_string] = '$' . $prefix_type . '/' . $result . '$act:delete';
return $args[$prefix_type] . '/' . self::_insertRouteVars($result, $args2);
$internal_url = self::_insertRouteVars($result, $args2);
return $args[$prefix_type] . ($internal_url ? ('/' . $internal_url) : '');
}
}
}
@ -373,7 +375,8 @@ class Router
if ($prefix_type !== 'module' || !isset(self::$_except_modules[$args[$prefix_type]]))
{
self::$_route_cache[$rewrite_level][$keys_string] = '$' . $prefix_type . '/$act';
return $args[$prefix_type] . '/' . $args['act'] . (count($args2) ? ('?' . http_build_query($args2)) : '');
$internal_url = $args['act'] . (count($args2) ? ('?' . http_build_query($args2)) : '');
return $args[$prefix_type] . ($internal_url ? ('/' . $internal_url) : '');
}
}