aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_forum.php
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2015-01-28 09:27:16 +0100
committerTristan Darricau <github@nicofuma.fr>2015-01-28 09:27:16 +0100
commit0bdb4c1ed6369a2efd8bf527b2bc48bcd69df1bb (patch)
tree527e1475e1e0fd0f011c56e3c2e56c769e08f8fa /phpBB/includes/mcp/mcp_forum.php
parent828aa34ff99cecef3442e2d28dae5734f7db6e12 (diff)
parent7fc586080bf5e7b6e90dcf44526200d7c9356d57 (diff)
downloadforums-0bdb4c1ed6369a2efd8bf527b2bc48bcd69df1bb.tar
forums-0bdb4c1ed6369a2efd8bf527b2bc48bcd69df1bb.tar.gz
forums-0bdb4c1ed6369a2efd8bf527b2bc48bcd69df1bb.tar.bz2
forums-0bdb4c1ed6369a2efd8bf527b2bc48bcd69df1bb.tar.xz
forums-0bdb4c1ed6369a2efd8bf527b2bc48bcd69df1bb.zip
Merge pull request #3263 from MGaetan89/ticket/13468
[ticket/13468] Change add_log() calls with $phpbb_log->add() * MGaetan89/ticket/13468: [ticket/13468] Update calls to `add_log()`
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
-rw-r--r--phpBB/includes/mcp/mcp_forum.php17
1 files changed, 13 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 8d2cc478f3..be17d7fe47 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -339,7 +339,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
*/
function mcp_resync_topics($topic_ids)
{
- global $auth, $db, $template, $phpEx, $user, $phpbb_root_path;
+ global $auth, $db, $template, $phpEx, $user, $phpbb_root_path, $phpbb_log;
if (!sizeof($topic_ids))
{
@@ -364,7 +364,11 @@ function mcp_resync_topics($topic_ids)
// Log this action
while ($row = $db->sql_fetchrow($result))
{
- add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_TOPIC_RESYNC', $row['topic_title']);
+ $phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_TOPIC_RESYNC', false, array(
+ 'forum_id' => $row['forum_id'],
+ 'topic_id' => $row['topic_id'],
+ $row['topic_title']
+ ));
}
$db->sql_freeresult($result);
@@ -383,7 +387,7 @@ function mcp_resync_topics($topic_ids)
*/
function merge_topics($forum_id, $topic_ids, $to_topic_id)
{
- global $db, $template, $user, $phpEx, $phpbb_root_path, $auth;
+ global $db, $template, $user, $phpEx, $phpbb_root_path, $auth, $phpbb_log;
if (!sizeof($topic_ids))
{
@@ -463,7 +467,12 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
$to_forum_id = $topic_data['forum_id'];
move_posts($post_id_list, $to_topic_id, false);
- add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $topic_data['topic_title']);
+
+ $phpbb_log->add('mod', $user->data['user_id'], $user->ip, 'LOG_MERGE', false, array(
+ 'forum_id' => $to_forum_id,
+ 'topic_id' => $to_topic_id,
+ $topic_data['topic_title']
+ ));
// Message and return links
$success_msg = 'POSTS_MERGED_SUCCESS';