Merge pull request #457 from marc1706/ticket/456

[ticket/456] Modify files for passing code sniffer
board3 · Feb 2, 2015 · 771fcfe · 771fcfe
2 parents e6aca6a + f1ca2d8
commit 771fcfe
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 142 deletions.
diff --git a/controller/main.php b/controller/main.php
@@ -116,7 +116,6 @@ public function __construct($portal_columns, $config, $controller_helper, $templ
 
 		if (!function_exists('obtain_portal_config'))
 		{
-			include($this->includes_path . 'functions_modules' . $this->php_ext);
 			include($this->includes_path . 'functions' . $this->php_ext);
 		}
 	}

diff --git a/includes/functions.php b/includes/functions.php
@@ -7,18 +7,15 @@
 *
 */
 
-// @codingStandardsIgnoreStart
-
 /**
  * @ignore
+ * @codingStandardsIgnoreFile
  */
 if (!defined('IN_PHPBB'))
 {
 	exit;
 }
 
-// @codingStandardsIgnoreEnd
-
 // Get portal config
 function obtain_portal_config()
 {

diff --git a/includes/functions_modules.php b/includes/functions_modules.php
diff --git a/tests/unit/functions/functions_modules_test.php b/tests/unit/functions/functions_modules_test.php
-Original file line number
+Diff line change
@@ Expand Up @@
     		if (!function_exists('obtain_portal_config'))
     		{
-    			include($this->includes_path . 'functions_modules' . $this->php_ext);
     			include($this->includes_path . 'functions' . $this->php_ext);
     		}
     	}
@@ Expand Down @@