aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/feed/topic.php
diff options
context:
space:
mode:
authorTristan Darricau <github@darricau.eu>2014-04-19 01:11:52 +0200
committerTristan Darricau <github@nicofuma.fr>2014-05-06 14:19:55 +0200
commitf4df3f0aaf72ac0bb1a2538b09da971d422e4dcc (patch)
tree8b5e4ddfdccef1f75b28f70ea1366aa93d1e5c6e /phpBB/phpbb/feed/topic.php
parentc7d29fbdb1bb0d265e7791ce40699def97f4388e (diff)
downloadforums-f4df3f0aaf72ac0bb1a2538b09da971d422e4dcc.tar
forums-f4df3f0aaf72ac0bb1a2538b09da971d422e4dcc.tar.gz
forums-f4df3f0aaf72ac0bb1a2538b09da971d422e4dcc.tar.bz2
forums-f4df3f0aaf72ac0bb1a2538b09da971d422e4dcc.tar.xz
forums-f4df3f0aaf72ac0bb1a2538b09da971d422e4dcc.zip
[ticket/12421] Don't parse [attachment] tags if user can't view them
https://tracker.phpbb.com/browse/PHPBB3-12421 PHPBB3-12421
Diffstat (limited to 'phpBB/phpbb/feed/topic.php')
-rw-r--r--phpBB/phpbb/feed/topic.php7
1 files changed, 7 insertions, 0 deletions
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;