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

Merge remote-tracking branch 'vsephpbb/ticket/12263' into develop

Browse source 
* vsephpbb/ticket/12263:
  [ticket/12263] Add missing variable names to docblock fixes
  [ticket/12263] Remove invalid SQL query and unused variables
  [ticket/12263] Remove unused argument in module add/remove
  [ticket/12263] Fix incorrect docblock commets
This commit is contained in:
Joas Schilling 2014-03-14 09:25:32 +01:00
commit 3c6a17ae6b
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
/** @var \phpbb\cache\service */ /** @var \phpbb\cache\service */
protected $cache; protected $cache;
/** @var dbal */ /** @var \phpbb\db\driver\driver */
protected $db; protected $db;
/** @var \phpbb\user */ /** @var \phpbb\user */
@ -38,7 +38,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
* Constructor * Constructor
* *
* @param \phpbb\db\driver\driver $db * @param \phpbb\db\driver\driver $db
* @param mixed $cache * @param \phpbb\cache\service $cache
* @param \phpbb\user $user * @param \phpbb\user $user
* @param string $phpbb_root_path * @param string $phpbb_root_path
* @param string $php_ext * @param string $php_ext
@ -163,11 +163,10 @@ class module implements \phpbb\db\migration\tool\tool_interface
* ) * )
* Optionally you may not send 'modes' and it will insert all of the * Optionally you may not send 'modes' and it will insert all of the
* modules in that info file. * modules in that info file.
* @param string|bool $include_path If you would like to use a custom include
* path, specify that here * path, specify that here
* @return null * @return null
*/ */
public function add($class, $parent = 0, $data = array(), $include_path = false) public function add($class, $parent = 0, $data = array())
{ {
// Allows '' to be sent as 0 // Allows '' to be sent as 0
$parent = $parent ?: 0; $parent = $parent ?: 0;
@ -328,11 +327,10 @@ class module implements \phpbb\db\migration\tool\tool_interface
* @param int|string|bool $parent The parent module_id|module_langname(0 for no parent). * @param int|string|bool $parent The parent module_id|module_langname(0 for no parent).
* Use false to ignore the parent check and check class wide. * Use false to ignore the parent check and check class wide.
* @param int|string $module The module id|module_langname * @param int|string $module The module id|module_langname
* @param string|bool $include_path If you would like to use a custom include path,
* specify that here * specify that here
* @return null * @return null
*/ */
public function remove($class, $parent = 0, $module = '', $include_path = false) public function remove($class, $parent = 0, $module = '')
{ {
// Imitation of module_add's "automatic" and "manual" method so the uninstaller works from the same set of instructions for umil_auto // Imitation of module_add's "automatic" and "manual" method so the uninstaller works from the same set of instructions for umil_auto
if (is_array($module)) if (is_array($module))
@ -340,7 +338,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
if (isset($module['module_langname'])) if (isset($module['module_langname']))
{ {
// Manual Method // Manual Method
return $this->remove($class, $parent, $module['module_langname'], $include_path); return $this->remove($class, $parent, $module['module_langname']);
} }
// Failed. // Failed.
@ -407,22 +405,10 @@ class module implements \phpbb\db\migration\tool\tool_interface
$module_ids[] = (int) $module_id; $module_ids[] = (int) $module_id;
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$module_name = $module;
} }
else else
{ {
$module = (int) $module; $module_ids[] = (int) $module;
$sql = 'SELECT module_langname
FROM ' . $this->modules_table . "
WHERE module_id = $module
AND module_class = '" . $this->db->sql_escape($class) . "'
$parent_sql";
$result = $this->db->sql_query($sql);
$module_name = $this->db->sql_fetchfield('module_id');
$this->db->sql_freeresult($result);
$module_ids[] = $module;
} }
if (!class_exists('acp_modules')) if (!class_exists('acp_modules'))

4
phpBB/phpbb/db/migration/tool/permission.php
View file

@ -22,7 +22,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
/** @var \phpbb\cache\service */ /** @var \phpbb\cache\service */
protected $cache; protected $cache;
/** @var dbal */ /** @var \phpbb\db\driver\driver */
protected $db; protected $db;
/** @var string */ /** @var string */
@ -35,7 +35,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
* Constructor * Constructor
* *
* @param \phpbb\db\driver\driver $db * @param \phpbb\db\driver\driver $db
* @param mixed $cache * @param \phpbb\cache\service $cache
* @param \phpbb\auth\auth $auth * @param \phpbb\auth\auth $auth
* @param string $phpbb_root_path * @param string $phpbb_root_path
* @param string $php_ext * @param string $php_ext