From 3da67ce581d35f53b1b7e0ef7bce10f9261f8c6c Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Thu, 28 Sep 2017 20:02:15 +0200
Subject: [ticket/15245] Configure TextFormatter before rendering feeds

PHPBB3-15245
---
 phpBB/phpbb/feed/helper.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'phpBB/phpbb/feed/helper.php')

diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php
index 3bca8598a5..df7388331c 100644
--- a/phpBB/phpbb/feed/helper.php
+++ b/phpBB/phpbb/feed/helper.php
@@ -24,20 +24,25 @@ class helper
 	/** @var \phpbb\path_helper */
 	protected $path_helper;
 
+	/** @var \phpbb\textformatter\s9e\renderer */
+	protected $renderer;
+
 	/** @var \phpbb\user */
 	protected $user;
 
 	/**
 	 * Constructor
 	 *
-	 * @param	\phpbb\config\config	$config			Config object
-	 * @param	\phpbb\path_helper		$path_helper 	Path helper object
-	 * @param	\phpbb\user				$user			User object
+	 * @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
 	 */
-	public function __construct(\phpbb\config\config $config, \phpbb\path_helper $path_helper, \phpbb\user $user)
+	public function __construct(\phpbb\config\config $config, \phpbb\path_helper $path_helper, \phpbb\textformatter\s9e\renderer $renderer, \phpbb\user $user)
 	{
 		$this->config = $config;
 		$this->path_helper = $path_helper;
+		$this->renderer = $renderer;
 		$this->user = $user;
 	}
 
@@ -99,16 +104,12 @@ class helper
 			return '';
 		}
 
-		// Prepare some bbcodes for better parsing
-		$content = preg_replace("#\[quote(=&quot;.*?&quot;)?:$uid\]\s*(.*?)\s*\[/quote:$uid\]#si", "[quote$1:$uid]<br />$2<br />[/quote:$uid]", $content);
-
-		$content = generate_text_for_display($content, $uid, $bitfield, $options);
+		// 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()));
 
-		// Add newlines
-		$content = str_replace('<br />', '<br />' . "\n", $content);
+		$this->renderer->set_smilies_path($this->get_board_url() . '/' . $this->config['smilies_path']);
 
-		// Convert smiley Relative paths to Absolute path, Windows style
-		$content = str_replace($this->path_helper->get_web_root_path() . $this->config['smilies_path'], $this->get_board_url() . '/' . $this->config['smilies_path'], $content);
+		$content = generate_text_for_display($content, $uid, $bitfield, $options);
 
 		// Remove "Select all" link and mouse events
 		$content = str_replace('<a href="#" onclick="selectCode(this); return false;">' . $this->user->lang['SELECT_ALL_CODE'] . '</a>', '', $content);
-- 
cgit v1.2.1