Fixed logic and removed the error supressing
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index 56e4c2a..e537cde 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -58,13 +58,13 @@
$extension = end($x);
// Load the mime types
- if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
+ if (is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
{
include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT);
}
- else
+ elseif (is_file(APPPATH.'config/mimes'.EXT))
{
- @include(APPPATH.'config/mimes'.EXT);
+ include(APPPATH.'config/mimes'.EXT);
}
// Set a default mime if we can't find it
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index f4b48b4..7a35c3f 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -352,13 +352,13 @@
if ( ! is_array($mimes))
{
- if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
+ if (is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT))
{
include(APPPATH.'config/'.ENVIRONMENT.'/mimes'.EXT);
}
- else
+ elseif (is_file(APPPATH.'config/mimes'.EXT))
{
- @include(APPPATH.'config/mimes'.EXT);
+ include(APPPATH.'config/mimes'.EXT);
}
if ( ! is_array($mimes))
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index 15c15a9..53fc899 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -258,13 +258,13 @@
if ( ! is_array($_doctypes))
{
- if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT))
+ if (is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT))
{
include(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT);
}
- else
+ elseif (is_file(APPPATH.'config/doctypes'.EXT))
{
- @include(APPPATH.'config/doctypes'.EXT);
+ include(APPPATH.'config/doctypes'.EXT);
}
if ( ! is_array($_doctypes))
diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php
index 99f521f..6644089 100644
--- a/system/helpers/text_helper.php
+++ b/system/helpers/text_helper.php
@@ -366,18 +366,13 @@
{
function convert_accented_characters($str)
{
- if ( ! file_exists(APPPATH.'config/foreign_chars'.EXT) AND ! file_exists(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT))
+ if (is_file(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT))
{
- return $str;
+ include(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT);
}
-
- if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT))
+ elseif (is_file(APPPATH.'config/foreign_chars'.EXT))
{
- include APPPATH.'config/'.ENVIRONMENT.'/foreign_chars'.EXT;
- }
- else
- {
- include APPPATH.'config/foreign_chars'.EXT;
+ include(APPPATH.'config/foreign_chars'.EXT);
}
if ( ! isset($foreign_characters))