diff options
| author | rxu <rxu@mail.ru> | 2016-10-23 21:17:41 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2016-10-23 21:58:29 +0700 |
| commit | a02b124dd02f8c5a2d0c60820f6563311e983a4c (patch) | |
| tree | 272c854c7e8b78bfcb950e5a3a467f2b3eb88714 /phpBB/phpbb/db/migration/tool/module.php | |
| parent | 0cc092073405166a0da72009823256a00389d0b8 (diff) | |
| download | forums-a02b124dd02f8c5a2d0c60820f6563311e983a4c.tar forums-a02b124dd02f8c5a2d0c60820f6563311e983a4c.tar.gz forums-a02b124dd02f8c5a2d0c60820f6563311e983a4c.tar.bz2 forums-a02b124dd02f8c5a2d0c60820f6563311e983a4c.tar.xz forums-a02b124dd02f8c5a2d0c60820f6563311e983a4c.zip | |
[ticket/14831] Do not throw exception on the module existence checking
PHPBB3-14831
Diffstat (limited to 'phpBB/phpbb/db/migration/tool/module.php')
| -rw-r--r-- | phpBB/phpbb/db/migration/tool/module.php | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php index d28d6153b9..e8f2eaf80b 100644 --- a/phpBB/phpbb/db/migration/tool/module.php +++ b/phpBB/phpbb/db/migration/tool/module.php @@ -90,8 +90,15 @@ class module implements \phpbb\db\migration\tool\tool_interface $parent_sql = ''; if ($parent !== false) { - $parent = $this->get_parent_module_id($parent, $module); - $parent_sql = 'AND parent_id = ' . (int) $parent; + $parent = $this->get_parent_module_id($parent, $module, false); + if ($parent !== false) + { + $parent_sql = 'AND parent_id = ' . (int) $parent; + } + else + { + return false; + } } $sql = 'SELECT module_id @@ -468,11 +475,15 @@ class module implements \phpbb\db\migration\tool\tool_interface * * @param string|int $parent_id The parent module_id|module_langname * @param int|string|array $data The module_id, module_langname for existance checking or module data array for adding - * @return int The parent module_id + * @param bool $throw_exception The flag indicating if exception should be thrown on error + * @return mixed The int parent module_id or false * @throws \phpbb\db\migration\exception */ - public function get_parent_module_id($parent_id, $data = '') + public function get_parent_module_id($parent_id, $data = '', $throw_exception = true) { + // Initialize exception object placeholder + $e = false; + // Allow '' to be sent as 0 $parent_id = $parent_id ?: 0; @@ -494,7 +505,7 @@ class module implements \phpbb\db\migration\tool\tool_interface { // No parent with the given module_langname exist case 0: - throw new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $parent_id); + $e = new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $parent_id); break; // Return the module id @@ -516,7 +527,7 @@ class module implements \phpbb\db\migration\tool\tool_interface $parent_id = (int) $this->db->sql_fetchfield('parent_id'); if (!$parent_id) { - throw new \phpbb\db\migration\exception('PARENT_MODULE_FIND_ERROR', $data['parent_id']); + $e = new \phpbb\db\migration\exception('PARENT_MODULE_FIND_ERROR', $data['parent_id']); } } else if (!empty($data) && !is_array($data)) @@ -534,12 +545,21 @@ class module implements \phpbb\db\migration\tool\tool_interface else { //Unable to get the parent module id, throwing an exception - throw new \phpbb\db\migration\exception('MODULE_EXIST_MULTIPLE', $parent_id); + $e = new \phpbb\db\migration\exception('MODULE_EXIST_MULTIPLE', $parent_id); } break; } } + if ($e !== false) + { + if ($throw_exception) + { + throw $e; + } + return false; + } + return $parent_id; } } |