diff options
| author | Cesar G <prototech91@gmail.com> | 2013-11-13 23:58:21 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2013-11-14 01:05:58 -0800 |
| commit | 287c2550b8689a6fd34043ec4b5652997e9a6ab7 (patch) | |
| tree | d62deab38d5d3356fef0fadc0c2393c7c5e606ff | |
| parent | 50896305fa9b5b0db733ae4a401c9bd0a85cabe9 (diff) | |
| download | forums-287c2550b8689a6fd34043ec4b5652997e9a6ab7.tar forums-287c2550b8689a6fd34043ec4b5652997e9a6ab7.tar.gz forums-287c2550b8689a6fd34043ec4b5652997e9a6ab7.tar.bz2 forums-287c2550b8689a6fd34043ec4b5652997e9a6ab7.tar.xz forums-287c2550b8689a6fd34043ec4b5652997e9a6ab7.zip | |
[ticket/12008] Update the run time value for the prune notifications cron task
PHPBB3-12008
| -rw-r--r-- | phpBB/config/services.yml | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/manager.php | 9 | ||||
| -rw-r--r-- | tests/notification/base.php | 1 | ||||
| -rw-r--r-- | tests/notification/submit_post_base.php | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 4280f90375..84143a2362 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -244,6 +244,7 @@ services: - @notification.method_collection - @service_container - @user_loader + - @config - @dbal.conn - @cache - @user diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index d77a936413..2e8652771b 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -27,6 +27,9 @@ class manager /** @var \phpbb\user_loader */ protected $user_loader; + /** @var \phpbb\config\config */ + protected $config; + /** @var \phpbb\db\driver\driver */ protected $db; @@ -58,6 +61,7 @@ class manager * @param array $notification_methods * @param ContainerBuilder $phpbb_container * @param \phpbb\user_loader $user_loader + * @param \phpbb\config\config $config * @param \phpbb\db\driver\driver $db * @param \phpbb\user $user * @param string $phpbb_root_path @@ -67,13 +71,14 @@ class manager * @param string $user_notifications_table * @return \phpbb\notification\manager */ - public function __construct($notification_types, $notification_methods, $phpbb_container, \phpbb\user_loader $user_loader, \phpbb\db\driver\driver $db, \phpbb\cache\service $cache, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table) + public function __construct($notification_types, $notification_methods, $phpbb_container, \phpbb\user_loader $user_loader, \phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\cache\service $cache, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table) { $this->notification_types = $notification_types; $this->notification_methods = $notification_methods; $this->phpbb_container = $phpbb_container; $this->user_loader = $user_loader; + $this->config = $config; $this->db = $db; $this->cache = $cache; $this->user = $user; @@ -797,6 +802,8 @@ class manager WHERE notification_time < ' . (int) $timestamp . (($only_read) ? ' AND notification_read = 1' : ''); $this->db->sql_query($sql); + + $this->config->set('read_notification_last_gc', time(), false); } /** diff --git a/tests/notification/base.php b/tests/notification/base.php index 549545f01b..f6333866c3 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -70,6 +70,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case array(), $this->container, $this->user_loader, + $this->config, $this->db, $this->cache, $this->user, diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index 8597c626a4..a9ed59686a 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -118,7 +118,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case // Notification Manager $phpbb_notifications = new \phpbb\notification\manager($notification_types_array, array(), - $phpbb_container, $user_loader, $db, $cache, $user, + $phpbb_container, $user_loader, $config, $db, $cache, $user, $phpbb_root_path, $phpEx, NOTIFICATION_TYPES_TABLE, NOTIFICATIONS_TABLE, USER_NOTIFICATIONS_TABLE); $phpbb_container->set('notification_manager', $phpbb_notifications); |