aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/feed
diff options
context:
space:
mode:
authorCarstenF <CarstenF@users.phpbb.com>2015-07-15 19:39:54 +0200
committerZoddo <zoddo.ino@gmail.com>2015-07-15 19:39:54 +0200
commit23f1b7d9c7228746008a215ff944adf13f54251d (patch)
treeb4c295f38ac37fa58f566d3e77df06086ae3d7b6 /phpBB/phpbb/feed
parent3768f7f2b8ff9dc5915385047e6b195d46de7503 (diff)
downloadforums-23f1b7d9c7228746008a215ff944adf13f54251d.tar
forums-23f1b7d9c7228746008a215ff944adf13f54251d.tar.gz
forums-23f1b7d9c7228746008a215ff944adf13f54251d.tar.bz2
forums-23f1b7d9c7228746008a215ff944adf13f54251d.tar.xz
forums-23f1b7d9c7228746008a215ff944adf13f54251d.zip
[ticket/13988] Use absolute path for image attachments in feeds
Previously, atom feeds use relative links for image attachments PHPBB3-13988
Diffstat (limited to 'phpBB/phpbb/feed')
-rw-r--r--phpBB/phpbb/feed/helper.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php
index 198134cdcf..f2030f5ced 100644
--- a/phpBB/phpbb/feed/helper.php
+++ b/phpBB/phpbb/feed/helper.php
@@ -149,12 +149,10 @@ class helper
{
$update_count = array();
parse_attachments($forum_id, $content, $post_attachments, $update_count);
- $post_attachments = implode('<br />', $post_attachments);
+ $content .= implode('<br />', $post_attachments);
// Convert attachments' relative path to absolute path
- $post_attachments = str_replace($this->phpbb_root_path . 'download/file.' . $this->phpEx, $this->get_board_url() . '/download/file.' . $this->phpEx, $post_attachments);
-
- $content .= $post_attachments;
+ $content = str_replace($this->phpbb_root_path . 'download/file.' . $this->phpEx, $this->get_board_url() . '/download/file.' . $this->phpEx, $content);
}
// Remove Comments from inline attachments [ia]