mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:05:23 +02:00
Code Issues Releases Wiki Activity

[ticket/11103] Fixing a few bugs from the previous changes

Browse Source 
PHPBB3-11103
This commit is contained in:
Nathan Guse
2012-10-04 21:39:17 -05:00
parent fa605402f7
commit ceb56da965
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/notification/manager.php
View File

@ -30,7 +30,7 @@ class phpbb_notification_manager
*/
protected $users = array();
public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
{
$this->db = $db;
$this->cache = $cache;
@ -462,7 +462,7 @@ class phpbb_notification_manager
{
$subscription_types = array();
foreach ($this->get_subscription_files('notifications/type/') as $class_name => $file)
foreach ($this->get_subscription_files('notification/type/') as $class_name => $file)
{
$class_name = $this->get_item_type_class_name($class_name);
@ -498,7 +498,7 @@ class phpbb_notification_manager
{
$subscription_methods = array();
foreach ($this->get_subscription_files('notifications/method/') as $method_name => $file)
foreach ($this->get_subscription_files('notification/method/') as $method_name => $file)
{
$class_name = 'phpbb_notification_method_' . $method_name;

3
phpBB/includes/notification/method/base.php
View File

@ -50,8 +50,9 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
*/
protected $queue = array();
public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
{
$this->notification_manager = $notification_manager;
$this->db = $db;
$this->cache = $cache;
$this->template = $template;