From 657ddf8309ab86bd0db84e4fdddfe2b73f542d4b Mon Sep 17 00:00:00 2001 From: Dhruv Date: Fri, 27 Dec 2013 01:19:16 +0530 Subject: [ticket/11271] limit absolute path conversion to attachment links only PHPBB3-11271 --- phpBB/phpbb/feed/helper.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'phpBB/phpbb') diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php index 1cc8cb221c..eebece00c4 100644 --- a/phpBB/phpbb/feed/helper.php +++ b/phpBB/phpbb/feed/helper.php @@ -142,7 +142,12 @@ class helper { $update_count = array(); parse_attachments($forum_id, $content, $post_attachments, $update_count); - $content .= implode('
', $post_attachments); + $post_attachments = implode('
', $post_attachments); + + // Convert attachments' relative path to absolute path + $post_attachments = str_replace($this->phpbb_root_path . 'download', $this->get_board_url() . '/download', $post_attachments); + + $content .= $post_attachments; } // Remove Comments from inline attachments [ia] @@ -164,9 +169,6 @@ class helper // Other control characters $content = preg_replace('#(?:[\x00-\x1F\x7F]+|(?:\xC2[\x80-\x9F])+)#', '', $content); - // Convert attachments' relative path to absolute path - $content = str_replace($this->phpbb_root_path . 'download', $this->get_board_url() . '/download', $content); - return $content; } } -- cgit v1.2.1