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

[ticket/12263] Remove unused argument in module add/remove

Browse source 
PHPBB3-12263
This commit is contained in:
Matt Friedman 2014-03-13 16:10:08 -07:00
parent 89b0ff1da8
commit 5df3e0a4ec
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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.