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

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