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/phpbb/feed/forum.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/phpbb/feed/forum.php')
| -rw-r--r-- | phpBB/phpbb/feed/forum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php index 8026824ab7..85ecb60f7e 100644 --- a/phpBB/phpbb/feed/forum.php +++ b/phpBB/phpbb/feed/forum.php @@ -109,7 +109,7 @@ class forum extends \phpbb\feed\post_base } $this->sql = array( - 'SELECT' => 'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' . + 'SELECT' => 'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, p.post_attachment, ' . 'u.username, u.user_id', 'FROM' => array( POSTS_TABLE => 'p', |