fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Reorganize data exchange format between Context and Router

Browse source
This commit is contained in:
Kijin Sung 2020-06-18 20:06:59 +09:00
parent c8a6b8de79
commit 85fcc79457
4 changed files with 81 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/module/module.controller.php
View file

@ -25,8 +25,8 @@ class moduleController extends module
$args->module = $module;
$args->type = $type;
$args->act = $act;
$args->route_regexp = serialize($route_regexp);
$args->route_config = serialize($route_config);
$args->route_regexp = is_scalar($route_regexp) ? $route_regexp : serialize($route_regexp);
$args->route_config = is_scalar($route_config) ? $route_config : serialize($route_config);
$args->global_route = $global_route === 'Y' ? 'Y' : 'N';
$output = executeQuery('module.insertActionForward', $args);
@ -1363,7 +1363,7 @@ class moduleController extends module
if (!isset($action_forward[$action_name]))
{
$output = $this->insertActionForward($module_name, $route_info['type'], $action_name,
serialize($route_info['regexp']), serialize($route_info['config']));
$route_info['regexp'], $route_info['config'], $route_info['global_route']);
if (!$output->toBool())
{
return $output;