From f4df3f0aaf72ac0bb1a2538b09da971d422e4dcc Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 19 Apr 2014 01:11:52 +0200 Subject: [ticket/12421] Don't parse [attachment] tags if user can't view them https://tracker.phpbb.com/browse/PHPBB3-12421 PHPBB3-12421 --- phpBB/phpbb/feed/forum.php | 1 + phpBB/phpbb/feed/topic.php | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'phpBB/phpbb/feed') diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php index 8e6490923d..e35ec4baa4 100644 --- a/phpBB/phpbb/feed/forum.php +++ b/phpBB/phpbb/feed/forum.php @@ -132,6 +132,7 @@ class forum extends \phpbb\feed\post_base parent::adjust_item($item_row, $row); $item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title']; + $item_row['forum_id'] = $this->forum_id; } function get_item() diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php index fb49aa65cc..10b0f4f645 100644 --- a/phpBB/phpbb/feed/topic.php +++ b/phpBB/phpbb/feed/topic.php @@ -105,6 +105,13 @@ class topic extends \phpbb\feed\post_base return true; } + function adjust_item(&$item_row, &$row) + { + parent::adjust_item($item_row, $row); + + $item_row['forum_id'] = $this->forum_id; + } + function get_item() { return ($row = parent::get_item()) ? array_merge($this->topic_data, $row) : $row; -- cgit v1.2.1