diff options
| author | Tristan Darricau <github@darricau.eu> | 2014-04-16 23:41:10 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2014-05-02 13:25:33 +0200 |
| commit | e7f970e26d636d69ea742bf591dc5fc9dc15a0a9 (patch) | |
| tree | 49041efdbac7f89204fefa3f42f331a9781a5f2f /phpBB/feed.php | |
| parent | 76574d4b5e6c2f6de0faf175c745bcdc74c60f4e (diff) | |
| download | forums-e7f970e26d636d69ea742bf591dc5fc9dc15a0a9.tar forums-e7f970e26d636d69ea742bf591dc5fc9dc15a0a9.tar.gz forums-e7f970e26d636d69ea742bf591dc5fc9dc15a0a9.tar.bz2 forums-e7f970e26d636d69ea742bf591dc5fc9dc15a0a9.tar.xz forums-e7f970e26d636d69ea742bf591dc5fc9dc15a0a9.zip | |
[ticket/12413] Fatal Error for feed.php?mode=forums
https://tracker.phpbb.com/browse/PHPBB3-12413
http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=45475
PHPBB3-12413
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index 9ff8c66b9d..0c4cc32fdb 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -73,9 +73,6 @@ if ($feed === false) trigger_error('NO_FEED'); } -// Get attachments for this feed -$feed->fetch_attachments(); - // Open Feed $feed->open(); @@ -111,7 +108,7 @@ while ($row = $feed->get_item()) 'title' => censor_text($title), 'category' => ($config['feed_item_statistics'] && !empty($row['forum_id'])) ? $board_url . '/viewforum.' . $phpEx . '?f=' . $row['forum_id'] : '', 'category_name' => ($config['feed_item_statistics'] && isset($row['forum_name'])) ? $row['forum_name'] : '', - 'description' => censor_text($phpbb_feed_helper->generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], (($row['post_attachment']) ? $feed->attachments[$row['post_id']] : array()))), + 'description' => censor_text($phpbb_feed_helper->generate_content($row[$feed->get('text')], $row[$feed->get('bbcode_uid')], $row[$feed->get('bitfield')], $options, $row['forum_id'], ((isset($row['post_attachment']) && $row['post_attachment']) ? $feed->get_attachments($row['post_id']) : array()))), 'statistics' => '', ); |