mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
* 3.1.x:
  [ticket/13988] Update tests
  [ticket/13988] Use absolute path for image attachments in feeds
This commit is contained in:
Tristan Darricau
2015-08-28 17:34:50 +02:00
parent c3ceafb37d bfbce5a1b0
commit 214c5c6d0b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/feed/helper.php
View File

@@ -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]