makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11871] Allow backslash in classnames for Modules

Browse source 
PHPBB3-11871
This commit is contained in:
Joas Schilling 2013-09-27 18:14:58 +02:00
parent 08b49203b4
commit e0adb15074
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_modules.php
View file

@ -565,7 +565,7 @@ class acp_modules
{ {
// Skip entries we do not need if we know the module we are // Skip entries we do not need if we know the module we are
// looking for // looking for
if ($module && strpos(str_replace('\\', '_', $cur_module), $module) === false) if ($module && strpos(str_replace('\\', '_', $cur_module), $module) === false && $module !== $cur_module)
{ {
continue; continue;
} }

7
phpBB/phpbb/db/migration/tool/module.php
View file

@ -182,9 +182,6 @@ class module implements \phpbb\db\migration\tool\tool_interface
{ {
// The "automatic" way // The "automatic" way
$basename = (isset($data['module_basename'])) ? $data['module_basename'] : ''; $basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
$basename = str_replace(array('/', '\\'), '', $basename);
$class = str_replace(array('/', '\\'), '', $class);
$module = $this->get_module_info($class, $basename); $module = $this->get_module_info($class, $basename);
$result = ''; $result = '';
@ -353,9 +350,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
} }
// Automatic method // Automatic method
$basename = str_replace(array('/', '\\'), '', $module['module_basename']); $basename = $module['module_basename'];
$class = str_replace(array('/', '\\'), '', $class);
$module_info = $this->get_module_info($class, $basename); $module_info = $this->get_module_info($class, $basename);
foreach ($module_info['modes'] as $mode => $info) foreach ($module_info['modes'] as $mode => $info)