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

Prevent Rhymix reserved namespaces from being registered as custom

Browse source
This commit is contained in:
Kijin Sung 2023-08-12 09:50:10 +09:00
parent 5823253d60
commit 47996cb294
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/parsers/ModuleActionParser.php
View file

@ -252,7 +252,7 @@ class ModuleActionParser extends BaseParser
// Parse custom namespaces. // Parse custom namespaces.
foreach ($xml->namespaces->namespace ?: [] as $namespace) foreach ($xml->namespaces->namespace ?: [] as $namespace)
{ {
$info->namespaces[] = strval($namespace['name']); $info->namespaces[] = trim($namespace['name'], '/\\');
} }
// Parse custom prefixes. // Parse custom prefixes.

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

@ -1458,7 +1458,12 @@ class ModuleController extends Module
// Add all namespaces defined by this module. // Add all namespaces defined by this module.
foreach ($module_action_info->namespaces ?? [] as $name) foreach ($module_action_info->namespaces ?? [] as $name)
{ {
if(!isset($namespaces[$name])) if (preg_match('/^Rhymix\\\\/i', $name))
{
continue;
}
if (!isset($namespaces[$name]))
{ {
$namespaces[$name] = 'modules/' . $module_name; $namespaces[$name] = 'modules/' . $module_name;
$changed = true; $changed = true;