mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2330 from Nicofuma/ticket/12421

Browse Source 
[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:
Joas Schilling
2014-05-06 21:50:42 +02:00
parent 0d4a7d76f4 62b4e7b9d2
commit 6d40d437eb
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/phpbb/feed/forum.php
View File

@@ -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()

7
phpBB/phpbb/feed/topic.php
View File

@@ -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;