diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-05-31 17:21:00 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-05-31 17:21:00 +0200 |
| commit | cae1f8bc869c86214969094dccd151a70b7a0364 (patch) | |
| tree | 64e81e29571a98a2cfc724a44b3bf0e7809bfba5 /phpBB/includes/db | |
| parent | 399d9ee5e15179a74d7afa7c970cb212855c1804 (diff) | |
| parent | 49de9e3d444ab71a2ad1e5ac1db6d92e3cb80466 (diff) | |
| download | forums-cae1f8bc869c86214969094dccd151a70b7a0364.tar forums-cae1f8bc869c86214969094dccd151a70b7a0364.tar.gz forums-cae1f8bc869c86214969094dccd151a70b7a0364.tar.bz2 forums-cae1f8bc869c86214969094dccd151a70b7a0364.tar.xz forums-cae1f8bc869c86214969094dccd151a70b7a0364.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11387' into develop
* EXreaction/ticket/11387:
[ticket/11387] Log module added only after it has been added
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/migration/tool/module.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php index ec683d36af..ac4d2c9bd7 100644 --- a/phpBB/includes/db/migration/tool/module.php +++ b/phpBB/includes/db/migration/tool/module.php @@ -209,9 +209,6 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac } // 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)) { $sql = 'SELECT module_id @@ -267,6 +264,8 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac else { // 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 if (isset($data['before']) && $data['before']) |