Merge branch '2.1.x'

includes/functions.php

@@ -1,4 +1,5 @@
 <?php
+// @codingStandardsIgnoreFile
 /**
 *
 * @package Board3 Portal v2.1
@@ -9,7 +10,6 @@
 
 /**
  * @ignore
- * @codingStandardsIgnoreFile
  */
 if (!defined('IN_PHPBB'))
 {

modules/announcements.php

@@ -246,8 +246,8 @@ class announcements extends module_base
 			// Assign announcements row
 			$this->template->assign_block_vars('announcements', $announcements_row);
 
-			if($announcement < 0)
 			// Show the announcements overview
+			if($announcement < 0)
 			{
 				$count = $fetch_news['topic_count'];
 				for ($i = 0; $i < $count; $i++)
@@ -363,12 +363,12 @@ class announcements extends module_base
 					}
 				}
 			}
-			else
 			// Show "read full" page
+			else
 			{
 				$i = $announcement;
 
-				/** 
+				/**
 				* redirect to portal page if the specified announcement does not exist
 				* force #top anchor in order to get rid of the #a anchor
 				*/

modules/news.php

@@ -243,8 +243,8 @@ class news extends module_base
 			// Create standard news row
 			$this->template->assign_block_vars('news', $news_row);
 
-			if($news < 0)
 			// Show the news overview
+			if($news < 0)
 			{
 				$count = $fetch_news['topic_count'];
 				for ($i = 0; $i < $count; $i++)
@@ -360,8 +360,8 @@ class news extends module_base
 					}
 				}
 			}
-			else
 			// Show "read full" page
+			else
 			{
 				$i = $news;
 				$forum_id = $fetch_news[$i]['forum_id'];