phpBB

Code Changes

File: phpbb/db/migration/tool/module.php

  Unmodified   Added   Modified   Removed
Line 90Line 90
		$parent_sql = '';
if ($parent !== false)
{

		$parent_sql = '';
if ($parent !== false)
{

			$parent = $this->get_parent_module_id($parent, $module);






			$parent = $this->get_parent_module_id($parent, $module, false);
if ($parent === false)
{
return false;
}


			$parent_sql = 'AND parent_id = ' . (int) $parent;
}


			$parent_sql = 'AND parent_id = ' . (int) $parent;
}


Line 197Line 202

if ($this->exists($class, $parent, $data['module_langname']))
{


if ($this->exists($class, $parent, $data['module_langname']))
{

			throw new \phpbb\db\migration\exception('MODULE_EXISTS', $module_id);

			throw new \phpbb\db\migration\exception('MODULE_EXISTS', $data['module_langname']);

		}

if (!class_exists('acp_modules'))

		}

if (!class_exists('acp_modules'))

Line 448Line 453
	protected function get_categories_list()
{
// Select the top level categories

	protected function get_categories_list()
{
// Select the top level categories

		// and 2nd level [sub]categories which exist for ACP only

		// and 2nd level [sub]categories

		$sql = 'SELECT m2.module_id, m2.module_langname
FROM ' . $this->modules_table . ' m1, ' . $this->modules_table . " m2
WHERE m1.parent_id = 0

		$sql = 'SELECT m2.module_id, m2.module_langname
FROM ' . $this->modules_table . ' m1, ' . $this->modules_table . " m2
WHERE m1.parent_id = 0

				AND (m1.module_id = m2.module_id
OR m2.module_class = 'acp' AND m2.parent_id = m1.module_id)

				AND (m1.module_id = m2.module_id OR m2.parent_id = m1.module_id)


			ORDER BY m1.module_id, m2.module_id ASC";

$result = $this->db->sql_query($sql);

			ORDER BY m1.module_id, m2.module_id ASC";

$result = $this->db->sql_query($sql);

Line 469Line 473
	*
* @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

	*
* @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
*/

	* @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
$exception = false;


		// Allow '' to be sent as 0
$parent_id = $parent_id ?: 0;


		// Allow '' to be sent as 0
$parent_id = $parent_id ?: 0;


Line 495Line 503
			{
// No parent with the given module_langname exist
case 0:

			{
// No parent with the given module_langname exist
case 0:

					throw new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $parent_id);

					$exception = new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $parent_id);

				break;

// Return the module id

				break;

// Return the module id

Line 517Line 525
						$parent_id = (int) $this->db->sql_fetchfield('parent_id');
if (!$parent_id)
{

						$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']);

							$exception = new \phpbb\db\migration\exception('PARENT_MODULE_FIND_ERROR', $data['parent_id']);

						}
}
else if (!empty($data) && !is_array($data))

						}
}
else if (!empty($data) && !is_array($data))

Line 535Line 543
					else
{
//Unable to get the parent module id, throwing an exception

					else
{
//Unable to get the parent module id, throwing an exception

						throw new \phpbb\db\migration\exception('MODULE_EXIST_MULTIPLE', $parent_id);

						$exception = new \phpbb\db\migration\exception('MODULE_EXIST_MULTIPLE', $parent_id);

					}
break;
}

					}
break;
}

 
		}

if ($exception !== false)
{
if ($throw_exception)
{
throw $exception;
}
return false;

		}

return $parent_id;

		}

return $parent_id;