diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-12-27 01:33:32 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-12-27 01:33:32 +0530 |
| commit | fd9366daf5a329abc91b173495efc8f94e4bd638 (patch) | |
| tree | 35c965fc900e67e1828c75af772d9f6c7e93597e /phpBB | |
| parent | 80c05e861bd8b5264daf6b1f92b69b5b77356f32 (diff) | |
| parent | a71625ca76344098a6e207928b839de576cdabb6 (diff) | |
| download | forums-fd9366daf5a329abc91b173495efc8f94e4bd638.tar forums-fd9366daf5a329abc91b173495efc8f94e4bd638.tar.gz forums-fd9366daf5a329abc91b173495efc8f94e4bd638.tar.bz2 forums-fd9366daf5a329abc91b173495efc8f94e4bd638.tar.xz forums-fd9366daf5a329abc91b173495efc8f94e4bd638.zip | |
Merge branch 'ticket/11271' into ticket/11271-develop
* ticket/11271:
[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.
Conflicts:
phpBB/feed.php
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/feed/helper.php | 10 | ||||
| -rw-r--r-- | phpBB/phpbb/feed/post_base.php | 24 |
2 files changed, 21 insertions, 13 deletions
diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php index 4d1722ea43..1cc8cb221c 100644 --- a/phpBB/phpbb/feed/helper.php +++ b/phpBB/phpbb/feed/helper.php @@ -81,6 +81,14 @@ class helper /** * Generate text content + * + * @param string $content is feed text content + * @param string $uid is bbcode_uid + * @param string $bitfield is bbcode bitfield + * @param int $options bbcode flag options + * @param int $forum_id is the forum id + * @param array $post_attachments is an array containing the attachments and their respective info + * @return string the html content to be printed for the feed */ public function generate_content($content, $uid, $bitfield, $options, $forum_id, $post_attachments) { @@ -130,7 +138,7 @@ class helper $content = preg_replace( '#<(script|iframe)([^[]+)\1>#siU', ' <strong>$1</strong> ', $content); // Parse inline images to display with the feed - if (count($post_attachments) > 0) + if (!empty($post_attachments)) { $update_count = array(); parse_attachments($forum_id, $content, $post_attachments, $update_count); diff --git a/phpBB/phpbb/feed/post_base.php b/phpBB/phpbb/feed/post_base.php index fbb8a3a271..c797d6a8ca 100644 --- a/phpBB/phpbb/feed/post_base.php +++ b/phpBB/phpbb/feed/post_base.php @@ -53,13 +53,13 @@ abstract class post_base extends \phpbb\feed\base function fetch_attachments() { $sql_array = array( - 'SELECT' => 'a.*', - 'FROM' => array( - ATTACHMENTS_TABLE => 'a' - ), - 'WHERE' => 'a.in_message = 0 ', - 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC' - ); + 'SELECT' => 'a.*', + 'FROM' => array( + ATTACHMENTS_TABLE => 'a' + ), + 'WHERE' => 'a.in_message = 0 ', + 'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC', + ); if (isset($this->topic_id)) { @@ -68,11 +68,11 @@ abstract class post_base extends \phpbb\feed\base else if (isset($this->forum_id)) { $sql_array['LEFT_JOIN'] = array( - array( - 'FROM' => array(TOPICS_TABLE => 't'), - 'ON' => 'a.topic_id = t.topic_id' - ) - ); + array( + 'FROM' => array(TOPICS_TABLE => 't'), + 'ON' => 'a.topic_id = t.topic_id', + ) + ); $sql_array['WHERE'] .= 'AND t.forum_id = ' . (int) $this->forum_id; } |