aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php9
-rw-r--r--phpBB/includes/log/log.php13
2 files changed, 13 insertions, 9 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9a1485f37a..3e3d796ba2 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3392,14 +3392,11 @@ function add_log()
case 'critical':
break;
case 'mod':
- // forum_id
- $additional_data[] = array_shift($args);
- // topic_id
- $additional_data[] = array_shift($args);
+ $additional_data['forum_id'] = array_shift($args);
+ $additional_data['topic_id'] = array_shift($args);
break;
case 'user':
- // reportee_id
- $additional_data[] = array_shift($args);
+ $additional_data['reportee_id'] = array_shift($args);
break;
default:
/**
diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 89dc22593e..2523b97dbe 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -115,18 +115,25 @@ class phpbb_log implements phpbb_log_interface
break;
case 'mod':
+ $forum_id = (int) $additional_data['forum_id'];
+ unset($additional_data['forum_id']);
+ $topic_id = (int) $additional_data['topic_id'];
+ unset($additional_data['topic_id']);
$sql_ary += array(
'log_type' => LOG_MOD,
- 'forum_id' => intval(array_shift($additional_data)),
- 'topic_id' => intval(array_shift($additional_data)),
+ 'forum_id' => $forum_id,
+ 'topic_id' => $topic_id,
'log_data' => (!sizeof($additional_data)) ? '' : serialize($additional_data),
);
break;
case 'user':
+ $reportee_id = (int) $additional_data['reportee_id'];
+ unset($additional_data['reportee_id']);
+
$sql_ary += array(
'log_type' => LOG_USERS,
- 'reportee_id' => intval(array_shift($additional_data)),
+ 'reportee_id' => $reportee_id,
'log_data' => (!sizeof($additional_data)) ? '' : serialize($additional_data),
);
break;