mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/11103] Including the set call in the declaration throws errors

Browse Source 
Call the set_notification_manager from the load_object function instead.

PHPBB3-11103
This commit is contained in:
Nathan Guse
2013-01-15 12:29:20 -06:00
parent 07282a30ae
commit f089e099fe
2 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
phpBB/config/notifications.yml
View File

@@ -28,8 +28,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -48,8 +46,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -68,8 +64,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -88,8 +82,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -108,8 +100,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -128,8 +118,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -148,8 +136,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -168,8 +154,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -188,8 +172,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -208,8 +190,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -228,8 +208,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -248,8 +226,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -268,8 +244,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -288,8 +262,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -308,8 +280,6 @@ services:
- %tables.notification_types%
- %tables.notifications%
- %tables.user_notifications%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.type }
@@ -325,8 +295,6 @@ services:
- @config
- %core.root_path%
- %core.php_ext%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.method }
@@ -342,7 +310,5 @@ services:
- @config
- %core.root_path%
- %core.php_ext%
calls:
- [set_notification_manager, [@notification_manager]]
tags:
- { name: notification.method }

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

@@ -841,6 +841,13 @@ class phpbb_notification_manager
*/
protected function load_object($object_name)
{
return $this->phpbb_container->get($object_name);
$object = $this->phpbb_container->get($object_name);
if (method_exists($object, 'set_notification_manager'))
{
$object->set_notification_manager($this);
}
return $object;
}
}