Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12912] Undefined index when adding logs from extensions
This commit is contained in:
Joas Schilling 2014-08-06 23:36:11 +02:00
commit cadf4dd56a

View file

@ -245,9 +245,9 @@ class log implements \phpbb\log\log_interface
break; break;
case 'mod': 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']); 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']); unset($additional_data['topic_id']);
$sql_ary += array( $sql_ary += array(
'log_type' => LOG_MOD, 'log_type' => LOG_MOD,