2 files changed, 10 insertions, 20 deletions
diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml
index f82dd4b5a5..1076d13cce 100644
--- a/phpBB/config/default/container/services_notification.yml
+++ b/phpBB/config/default/container/services_notification.yml
@@ -23,7 +23,7 @@ services:
             - { name: service_collection, tag: notification.type }
 
     notification.type.base:
-        abstract:  true
+        abstract: true
         arguments:
             - @dbal.conn
             - @user
@@ -45,7 +45,7 @@ services:
     notification.type.approve_post:
         class: phpbb\notification\type\approve_post
         scope: prototype
-        parent: notification.type.base
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
@@ -59,16 +59,14 @@ services:
     notification.type.bookmark:
         class: phpbb\notification\type\bookmark
         scope: prototype
-        parent: notification.type.base
-        calls:
-            - [set_config, ["@config"]]
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.disapprove_post:
         class: phpbb\notification\type\disapprove_post
         scope: prototype
-        parent: notification.type.base
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
@@ -118,14 +116,14 @@ services:
     notification.type.post_in_queue:
         class: phpbb\notification\type\post_in_queue
         scope: prototype
-        parent: notification.type.base
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.quote:
         class: phpbb\notification\type\quote
         scope: prototype
-        parent: notification.type.base
+        parent: notification.type.post
         calls:
             - [set_utils, [@text_formatter.utils]]
         tags:
@@ -134,28 +132,28 @@ services:
     notification.type.report_pm:
         class: phpbb\notification\type\report_pm
         scope: prototype
-        parent: notification.type.base
+        parent: notification.type.pm
         tags:
             - { name: notification.type }
 
     notification.type.report_pm_closed:
         class: phpbb\notification\type\report_pm_closed
         scope: prototype
-        parent: notification.type.base
+        parent: notification.type.pm
         tags:
             - { name: notification.type }
 
     notification.type.report_post:
         class: phpbb\notification\type\report_post
         scope: prototype
-        parent: notification.type.base
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
     notification.type.report_post_closed:
         class: phpbb\notification\type\report_post_closed
         scope: prototype
-        parent: notification.type.base
+        parent: notification.type.post
         tags:
             - { name: notification.type }
 
diff --git a/phpBB/phpbb/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php
index 59423ca248..5b3fc3a1f2 100644
--- a/phpBB/phpbb/notification/type/bookmark.php
+++ b/phpBB/phpbb/notification/type/bookmark.php
@@ -48,14 +48,6 @@ class bookmark extends \phpbb\notification\type\post
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
-	/** @var \phpbb\config\config */
-	protected $config;
-
-	public function set_config(\phpbb\config\config $config)
-	{
-		$this->config = $config;
-	}
-
 	/**
 	* Is available
 	*/