diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-12-27 03:43:22 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-12-27 03:43:22 +0530 |
| commit | 99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85 (patch) | |
| tree | 68f578ec4c62f2db32079f4cce3ff134ea971f67 /phpBB/phpbb/feed/helper.php | |
| parent | 657ddf8309ab86bd0db84e4fdddfe2b73f542d4b (diff) | |
| parent | 1aa27f400cc6ece19775c5851c2e86db1a657df8 (diff) | |
| download | forums-99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85.tar forums-99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85.tar.gz forums-99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85.tar.bz2 forums-99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85.tar.xz forums-99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85.zip | |
Merge branch 'ticket/11271' into ticket/11271-develop
* ticket/11271:
[ticket/11271] Make path conversion more precise
Conflicts:
phpBB/feed.php
Diffstat (limited to 'phpBB/phpbb/feed/helper.php')
| -rw-r--r-- | phpBB/phpbb/feed/helper.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php index eebece00c4..12acf997ac 100644 --- a/phpBB/phpbb/feed/helper.php +++ b/phpBB/phpbb/feed/helper.php @@ -24,6 +24,9 @@ class helper /** @var string */ protected $phpbb_root_path; + /** @var string */ + protected $phpEx; + /** * Constructor * @@ -32,11 +35,12 @@ class helper * @param string $phpbb_root_path Root path * @return null */ - public function __construct(\phpbb\config\config $config, \phpbb\user $user, $phpbb_root_path) + public function __construct(\phpbb\config\config $config, \phpbb\user $user, $phpbb_root_path, $phpEx) { $this->config = $config; $this->user = $user; $this->phpbb_root_path = $phpbb_root_path; + $this->phpEx = $phpEx; } /** @@ -145,7 +149,7 @@ class helper $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); + $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; } |