Fixed coding to match standards from previous releases
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index e4f8cfa..b41c645 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -67,13 +67,13 @@
if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT))
{
- @include(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT);
+ include(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT);
}
else
{
@include(APPPATH.'config/hooks'.EXT);
}
-
+
if ( ! isset($hook) OR ! is_array($hook))
{
diff --git a/system/core/Router.php b/system/core/Router.php
index 005e817..bd363da 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -87,10 +87,10 @@
}
// Load the routes.php file.
-
+
if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/routes'.EXT))
{
- @include(APPPATH.'config/'.ENVIRONMENT.'/routes'.EXT);
+ include(APPPATH.'config/'.ENVIRONMENT.'/routes'.EXT);
}
else
{
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index a851e3c..56e4c2a 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -60,7 +60,7 @@
// Load the mime types
if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
{
- @include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT);
+ include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT);
}
else
{
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index fb074e0..f4b48b4 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -354,13 +354,13 @@
{
if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
{
- @include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT);
+ include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT);
}
else
{
@include(APPPATH.'config/mimes'.EXT);
}
-
+
if ( ! is_array($mimes))
{
return FALSE;
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index c94c880..15c15a9 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -260,13 +260,13 @@
{
if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT))
{
- @include(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT);
+ include(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT);
}
else
{
@include(APPPATH.'config/doctypes'.EXT);
}
-
+
if ( ! is_array($_doctypes))
{
return FALSE;
diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php
index 197bcb1..99f521f 100644
--- a/system/helpers/text_helper.php
+++ b/system/helpers/text_helper.php
@@ -373,7 +373,7 @@
if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT))
{
- include APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT;
+ include APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT;
}
else
{
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 24189f4..e8e47a1 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -142,7 +142,7 @@
*/
public function do_upload($field = 'userfile')
{
-
+
// Is $_FILES[$field] set? If not, no reason to continue.
if ( ! isset($_FILES[$field]))
{
@@ -953,13 +953,13 @@
{
if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
{
- $_mimes_path = APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT;
+ $_mimes_path = APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT;
}
else
{
$_mimes_path = APPPATH.'config/mimes'.EXT;
}
-
+
if (@require($_mimes_path))
{
$this->mimes = $mimes;
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 2690e17..38cdb40 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -92,7 +92,7 @@
{
$_ua_path = APPPATH.'config/user_agents'.EXT;
}
-
+
if ( ! @include($_ua_path))
{
return FALSE;