[ticket/11271] limit absolute path conversion to attachment links only

PHPBB3-11271
This commit is contained in:
Dhruv 2013-12-27 01:19:16 +05:30
parent fd9366daf5
commit 657ddf8309

View file

@ -142,7 +142,12 @@ class helper
{ {
$update_count = array(); $update_count = array();
parse_attachments($forum_id, $content, $post_attachments, $update_count); parse_attachments($forum_id, $content, $post_attachments, $update_count);
$content .= implode('<br />', $post_attachments); $post_attachments = implode('<br />', $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] // Remove Comments from inline attachments [ia]
@ -164,9 +169,6 @@ class helper
// Other control characters // Other control characters
$content = preg_replace('#(?:[\x00-\x1F\x7F]+|(?:\xC2[\x80-\x9F])+)#', '', $content); $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; return $content;
} }
} }