mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-12 11:44:08 +02:00
Merge pull request #2330 from Nicofuma/ticket/12421
[ticket/12421] Don't parse [attachment] tags if user can't view them * Nicofuma/ticket/12421: [ticket/12421] Rebase and enable tests [ticket/12421] Don't parse [attachment] tags if user can't view them
This commit is contained in:
@@ -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()
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user