diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-06 23:36:11 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-06 23:36:11 +0200 |
commit | cadf4dd56ad5ac5f691c7aa5f5da314f59e432a3 (patch) | |
tree | 7e08ebe89de16968c1b3b50a622cd8435011a433 | |
parent | 61bc6c4c676e3607528aaa0accbdfa352b9567ec (diff) | |
parent | ca110187605d6a651487d95e303bbc3627712d6d (diff) | |
download | forums-cadf4dd56ad5ac5f691c7aa5f5da314f59e432a3.tar forums-cadf4dd56ad5ac5f691c7aa5f5da314f59e432a3.tar.gz forums-cadf4dd56ad5ac5f691c7aa5f5da314f59e432a3.tar.bz2 forums-cadf4dd56ad5ac5f691c7aa5f5da314f59e432a3.tar.xz forums-cadf4dd56ad5ac5f691c7aa5f5da314f59e432a3.zip |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12912] Undefined index when adding logs from extensions
-rw-r--r-- | phpBB/phpbb/log/log.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php index c522c3273f..2af8b50b54 100644 --- a/phpBB/phpbb/log/log.php +++ b/phpBB/phpbb/log/log.php @@ -245,9 +245,9 @@ class log implements \phpbb\log\log_interface break; case 'mod': - $forum_id = (int) $additional_data['forum_id']; + $forum_id = isset($additional_data['forum_id']) ? (int) $additional_data['forum_id'] : 0; unset($additional_data['forum_id']); - $topic_id = (int) $additional_data['topic_id']; + $topic_id = isset($additional_data['topic_id']) ? (int) $additional_data['topic_id'] : 0; unset($additional_data['topic_id']); $sql_ary += array( 'log_type' => LOG_MOD, |