diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-03-26 21:17:02 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-03-26 21:17:02 +0200 |
| commit | b98a81364f8e2a02e457da050270b55e79893c70 (patch) | |
| tree | ac6788b681c93fad247e918486403e2be15f702e /phpBB/phpbb/db/migration/tool/module.php | |
| parent | 17c3bf0b39210f3c7519d4e652e431dbe38151d5 (diff) | |
| parent | 929bd2ac3c3abbec6c75100834725770f5eb0b44 (diff) | |
| download | forums-b98a81364f8e2a02e457da050270b55e79893c70.tar forums-b98a81364f8e2a02e457da050270b55e79893c70.tar.gz forums-b98a81364f8e2a02e457da050270b55e79893c70.tar.bz2 forums-b98a81364f8e2a02e457da050270b55e79893c70.tar.xz forums-b98a81364f8e2a02e457da050270b55e79893c70.zip | |
Merge branch 'prep-release-3.2.3' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/db/migration/tool/module.php')
| -rw-r--r-- | phpBB/phpbb/db/migration/tool/module.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php index 7d2720c861..e24c78e228 100644 --- a/phpBB/phpbb/db/migration/tool/module.php +++ b/phpBB/phpbb/db/migration/tool/module.php @@ -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; } |