3 files changed, 30 insertions, 13 deletions
diff --git a/phpBB/config/default/container/services_feed.yml b/phpBB/config/default/container/services_feed.yml
index 20ed193e96..e8bac4b5ce 100644
--- a/phpBB/config/default/container/services_feed.yml
+++ b/phpBB/config/default/container/services_feed.yml
@@ -18,6 +18,7 @@ services:
         class: phpbb\feed\helper
         arguments:
             - '@config'
+            - '@service_container'
             - '@path_helper'
             - '@text_formatter.renderer'
             - '@user'
@@ -78,6 +79,10 @@ services:
             - '@dispatcher'
             - '%core.php_ext%'
 
+    feed.quote_helper:
+        class: phpbb\feed\quote_helper
+        parent: text_formatter.s9e.quote_helper
+
     feed.topic:
         class: phpbb\feed\topic
         shared: false
diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php
index df7388331c..7d50b7ce7d 100644
--- a/phpBB/phpbb/feed/helper.php
+++ b/phpBB/phpbb/feed/helper.php
@@ -13,41 +13,52 @@
 
 namespace phpbb\feed;
 
+use phpbb\config\config;
+use phpbb\path_helper;
+use phpbb\textformatter\s9e\renderer;
+use phpbb\user;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
 /**
  * Class with some helpful functions used in feeds
  */
 class helper
 {
-	/** @var \phpbb\config\config */
+	/** @var config */
 	protected $config;
 
-	/** @var \phpbb\path_helper */
+	/** @var ContainerInterface */
+	protected $container;
+
+	/** @var path_helper */
 	protected $path_helper;
 
-	/** @var \phpbb\textformatter\s9e\renderer */
+	/** @var renderer */
 	protected $renderer;
 
-	/** @var \phpbb\user */
+	/** @var user */
 	protected $user;
 
 	/**
 	 * Constructor
 	 *
-	 * @param	\phpbb\config\config				$config			Config object
-	 * @param	\phpbb\path_helper					$path_helper 	Path helper object
-	 * @param	\phpbb\textformatter\s9e\renderer	$renderer		TextFormatter renderer object
-	 * @param	\phpbb\user							$user			User object
+	 * @param	config				$config			Config object
+	 * @param	ContainerInterface	$container		Service container object
+	 * @param	path_helper			$path_helper 	Path helper object
+	 * @param	renderer			$renderer		TextFormatter renderer object
+	 * @param	user				$user			User object
 	 */
-	public function __construct(\phpbb\config\config $config, \phpbb\path_helper $path_helper, \phpbb\textformatter\s9e\renderer $renderer, \phpbb\user $user)
+	public function __construct(config $config, ContainerInterface $container, path_helper $path_helper, renderer $renderer, user $user)
 	{
 		$this->config = $config;
+		$this->container = $container;
 		$this->path_helper = $path_helper;
 		$this->renderer = $renderer;
 		$this->user = $user;
 	}
 
 	/**
-	 * Run links through append_sid(), prepend generate_board_url() and remove session id
+	 * Returns the board url (and caches it in the function)
 	 */
 	public function get_board_url()
 	{
@@ -105,7 +116,7 @@ class helper
 		}
 
 		// Setup our own quote_helper to remove all attributes from quotes
-		$this->renderer->configure_quote_helper(new feed_quote_helper($this->user, $this->path_helper->get_phpbb_root_path(), $this->path_helper->get_php_ext()));
+		$this->renderer->configure_quote_helper($this->container->get('feed.quote_helper'));
 
 		$this->renderer->set_smilies_path($this->get_board_url() . '/' . $this->config['smilies_path']);
 
diff --git a/phpBB/phpbb/feed/feed_quote_helper.php b/phpBB/phpbb/feed/quote_helper.php
index 02a9b35dc0..843d075028 100644
--- a/phpBB/phpbb/feed/feed_quote_helper.php
+++ b/phpBB/phpbb/feed/quote_helper.php
@@ -16,7 +16,7 @@ namespace phpbb\feed;
 /**
  * Modified quote_helper for feeds (basically just removing all attributes)
  */
-class feed_quote_helper extends \phpbb\textformatter\s9e\quote_helper
+class quote_helper extends \phpbb\textformatter\s9e\quote_helper
 {
 	/**
 	 * {@inheritdoc}
@@ -27,7 +27,8 @@ class feed_quote_helper extends \phpbb\textformatter\s9e\quote_helper
 		return \s9e\TextFormatter\Utils::replaceAttributes(
 			$xml,
 			'QUOTE',
-			function () {
+			function ()
+			{
 				return [];
 			}
 		);