diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-11 09:53:52 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-11 09:53:52 +0100 |
| commit | 296af6c67910c74210354aec15eb04323f643acf (patch) | |
| tree | 5882aada5351d7bb23bce1c7a32b953e4f99c2c6 /phpBB/feed.php | |
| parent | 65626d602e3f9d2eb6ddb1e8a2454024dd36a8be (diff) | |
| parent | 99d312da2ac8a8b6d9d3ba7ff45cd7b59af00c85 (diff) | |
| download | forums-296af6c67910c74210354aec15eb04323f643acf.tar forums-296af6c67910c74210354aec15eb04323f643acf.tar.gz forums-296af6c67910c74210354aec15eb04323f643acf.tar.bz2 forums-296af6c67910c74210354aec15eb04323f643acf.tar.xz forums-296af6c67910c74210354aec15eb04323f643acf.zip | |
Merge remote-tracking branch 'dhruvgoel92/ticket/11271-develop' into develop
* dhruvgoel92/ticket/11271-develop: (25 commits)
[ticket/11271] Make path conversion more precise
[ticket/11271] limit absolute path conversion to attachment links only
[ticket/11271] Add docblock of feed_generate_content( )
[ticket/11271] Fix tabs and use !empty( ) instead of count( )
[ticket/11271] Remove unnecessary inclusion of functions_display
[ticket/11271] Typecast forum and topic id to integer
[ticket/11271] Use absolute path for displaying inline attachments in feeds
[ticket/11271] Changed executable bit.
[ticket/11271] Formatting code and removing null assignment.
[ticket/11271] Removing unnecessary database object
[ticket/11271] Separated attachment fetching query
[ticket/11271] Fetched feed attachments before loop.
[ticket/11271] Removed in-line attachment comments properly.
[ticket/11271] Displaying in-line attached images in ATOM feed.
[ticket/11271] Add the inline images html to content
[ticket/11271] Use class variable $db instead of global
[ticket/11271] Typecast forum and topic id to integer
[ticket/11271] Use absolute path for displaying inline attachments in feeds
[ticket/11271] Changed executable bit.
[ticket/11271] Formatting code and removing null assignment.
...
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index 35cd7fda3f..c31a6b6b1d 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -18,6 +18,7 @@ define('IN_PHPBB', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); +include($phpbb_root_path . 'includes/functions_display.' . $phpEx); if (!$config['feed_enable']) { @@ -72,6 +73,9 @@ if ($feed === false) trigger_error('NO_FEED'); } +// Get attachments for this feed +$feed->fetch_attachments(); + // Open Feed $feed->open(); @@ -107,7 +111,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)), + '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()))), 'statistics' => '', ); |