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

Merge remote-tracking branch 'EXreaction/ticket/11387' into develop

Browse source 
* EXreaction/ticket/11387:
  [ticket/11387] Log module added only after it has been added
This commit is contained in:
Joas Schilling 2013-05-31 17:21:00 +02:00
commit cae1f8bc86
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/db/migration/tool/module.php
View file

@ -209,9 +209,6 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
} }
// The "manual" way // The "manual" way
$module_log_name = ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']);
add_log('admin', 'LOG_MODULE_ADD', $module_log_name);
if (!is_numeric($parent)) if (!is_numeric($parent))
{ {
$sql = 'SELECT module_id $sql = 'SELECT module_id
@ -267,6 +264,8 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
else else
{ {
// Success // Success
$module_log_name = ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']);
add_log('admin', 'LOG_MODULE_ADD', $module_log_name);
// Move the module if requested above/below an existing one // Move the module if requested above/below an existing one
if (isset($data['before']) && $data['before']) if (isset($data['before']) && $data['before'])