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