aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/notification
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-01-15 12:29:20 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2013-01-15 12:29:20 -0600
commitf089e099fed38b1bdae5316fb09f0c8ed847d495 (patch)
tree8ca4d1d78114c8bb28027c6fb1f65e6cfe8cce80 /phpBB/includes/notification
parent07282a30ae077825ea81a4e26839ac0473dc97b7 (diff)
downloadforums-f089e099fed38b1bdae5316fb09f0c8ed847d495.tar
forums-f089e099fed38b1bdae5316fb09f0c8ed847d495.tar.gz
forums-f089e099fed38b1bdae5316fb09f0c8ed847d495.tar.bz2
forums-f089e099fed38b1bdae5316fb09f0c8ed847d495.tar.xz
forums-f089e099fed38b1bdae5316fb09f0c8ed847d495.zip
[ticket/11103] Including the set call in the declaration throws errors
Call the set_notification_manager from the load_object function instead. PHPBB3-11103
Diffstat (limited to 'phpBB/includes/notification')
-rw-r--r--phpBB/includes/notification/manager.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index a289ec0dfa..5c1016335a 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -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;
}
}