diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-28 17:05:09 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-28 17:05:09 +0200 |
| commit | bfbce5a1b0b2e22ea2027d82d87c8bc32917a5b2 (patch) | |
| tree | 3493189e256e12a56b134b3f33f4b4b35dc339f1 | |
| parent | 624f5ae921e0cb0967f0945fbb9c071617fb9ad8 (diff) | |
| parent | 7e1b0330a3ddd269c85047912c956daf930018cc (diff) | |
| download | forums-bfbce5a1b0b2e22ea2027d82d87c8bc32917a5b2.tar forums-bfbce5a1b0b2e22ea2027d82d87c8bc32917a5b2.tar.gz forums-bfbce5a1b0b2e22ea2027d82d87c8bc32917a5b2.tar.bz2 forums-bfbce5a1b0b2e22ea2027d82d87c8bc32917a5b2.tar.xz forums-bfbce5a1b0b2e22ea2027d82d87c8bc32917a5b2.zip | |
Merge pull request #3764 from Zoddo/ticket/13988
[ticket/13988] Use absolute path for image attachments in feeds
* Zoddo/ticket/13988:
[ticket/13988] Update tests
[ticket/13988] Use absolute path for image attachments in feeds
| -rw-r--r-- | phpBB/phpbb/feed/helper.php | 6 | ||||
| -rw-r--r-- | tests/functional/feed_test.php | 2 |
2 files changed, 3 insertions, 5 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] diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php index 9041c8dc69..ad5c4a5cab 100644 --- a/tests/functional/feed_test.php +++ b/tests/functional/feed_test.php @@ -1395,7 +1395,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case foreach ($attachments as $i => $attachment) { $content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text(); - $url = "./download/file.php?id={$attachment['id']}"; + $url = self::$root_url . "download/file.php?id={$attachment['id']}"; $string = "Attachment #{$i}"; if ($attachment['displayed']) |