mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge pull request #5163 from VSEphpbb/ticket/15595

Browse Source 
[ticket/15595] Fix module exists tool when ignoring parent check
This commit is contained in:
Marc Alexander
2018-03-26 20:22:16 +02:00
parent 1c30a9778d d7db5d366b
commit 364407ab59
2 changed files with 164 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/phpbb/db/migration/tool/module.php
View File

@@ -86,7 +86,8 @@ class module implements \phpbb\db\migration\tool\tool_interface
* check for to see if it exists
* @param bool $lazy Checks lazily if the module exists. Returns true if it exists in at
* least one given parent.
* @return bool true if module exists in *all* given parents, false if not
* @return bool true if module exists in *all* given parents, false if not in any given parent;
* true if ignoring parent check and module exists class wide, false if not found at all.
*/
public function exists($class, $parent, $module, $lazy = false)
{
@@ -110,6 +111,10 @@ class module implements \phpbb\db\migration\tool\tool_interface
$parent_sqls[] = 'AND parent_id = ' . (int) $parent_id;
}
}
else
{
$parent_sqls[] = '';
}
foreach ($parent_sqls as $parent_sql)
{
@@ -126,7 +131,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
{
return false;
}
else if ($lazy && $module_id)
if ($lazy && $module_id)
{
return true;
}