makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12517] Correctly call $log->add in prune shadow topics

Browse source 
PHPBB3-12517
This commit is contained in:
Marc Alexander 2014-05-11 10:31:28 +02:00
parent 4147681640
commit 9a295e4845
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/cron_tasks.yml
View file

@ -31,6 +31,7 @@ services:
- @config - @config
- @dbal.conn - @dbal.conn
- @log - @log
- @user
calls: calls:
- [set_name, [cron.task.core.prune_shadow_topics]] - [set_name, [cron.task.core.prune_shadow_topics]]
tags: tags:

10
phpBB/phpbb/cron/task/core/prune_shadow_topics.php
View file

@ -25,6 +25,7 @@ class prune_shadow_topics extends \phpbb\cron\task\base implements \phpbb\cron\t
protected $config; protected $config;
protected $db; protected $db;
protected $log; protected $log;
protected $user;
/** /**
* If $forum_data is given, it is assumed to contain necessary information * If $forum_data is given, it is assumed to contain necessary information
@ -44,14 +45,16 @@ class prune_shadow_topics extends \phpbb\cron\task\base implements \phpbb\cron\t
* @param \phpbb\config\config $config The config * @param \phpbb\config\config $config The config
* @param \phpbb\db\driver\driver $db The db connection * @param \phpbb\db\driver\driver $db The db connection
* @param \phpbb\log\log $log The phpBB log system * @param \phpbb\log\log $log The phpBB log system
* @param \phpbb\user $user The phpBB user object
*/ */
public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\log\log $log) public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\log\log $log, \phpbb\user $user)
{ {
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $this->php_ext = $php_ext;
$this->config = $config; $this->config = $config;
$this->db = $db; $this->db = $db;
$this->log = $log; $this->log = $log;
$this->user = $user;
} }
/** /**
@ -183,7 +186,10 @@ class prune_shadow_topics extends \phpbb\cron\task\base implements \phpbb\cron\t
WHERE forum_id = $forum_id"; WHERE forum_id = $forum_id";
$this->db->sql_query($sql); $this->db->sql_query($sql);
$this->log->add('admin', 'LOG_PRUNE_SHADOW', $row['forum_name']); $user_id = (empty($this->user->data)) ? ANONYMOUS : $this->user->data['user_id'];
$user_ip = (empty($this->user->ip)) ? '' : $this->user->ip;
$this->log->add('admin', $user_id, $user_ip, 'LOG_PRUNE_SHADOW', false, array($row['forum_name']));
} }
return; return;