diff options
| -rw-r--r-- | system/core/Hooks.php | 4 | ||||
| -rw-r--r-- | system/core/Router.php | 4 | ||||
| -rw-r--r-- | system/helpers/download_helper.php | 2 | ||||
| -rw-r--r-- | system/helpers/file_helper.php | 4 | ||||
| -rw-r--r-- | system/helpers/html_helper.php | 4 | ||||
| -rw-r--r-- | system/helpers/text_helper.php | 2 | ||||
| -rw-r--r-- | system/libraries/Upload.php | 6 | ||||
| -rw-r--r-- | system/libraries/User_agent.php | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/system/core/Hooks.php b/system/core/Hooks.php index e4f8cfa53..b41c645ae 100644 --- a/system/core/Hooks.php +++ b/system/core/Hooks.php @@ -67,13 +67,13 @@ class CI_Hooks { 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 005e81748..bd363da71 100644 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -87,10 +87,10 @@ class CI_Router { } // 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 a851e3c42..56e4c2a2f 100644 --- a/system/helpers/download_helper.php +++ b/system/helpers/download_helper.php @@ -60,7 +60,7 @@ if ( ! function_exists('force_download')) // 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 fb074e027..f4b48b484 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -354,13 +354,13 @@ if ( ! function_exists('get_mime_by_extension')) { 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 c94c88004..15c15a919 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -260,13 +260,13 @@ if ( ! function_exists('doctype')) { 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 197bcb14e..99f521fb5 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -373,7 +373,7 @@ if ( ! function_exists('convert_accented_characters')) 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 24189f4b4..e8e47a194 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -142,7 +142,7 @@ class CI_Upload { */ public function do_upload($field = 'userfile') { - + // Is $_FILES[$field] set? If not, no reason to continue. if ( ! isset($_FILES[$field])) { @@ -953,13 +953,13 @@ class CI_Upload { { 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 2690e174d..38cdb40f1 100644 --- a/system/libraries/User_agent.php +++ b/system/libraries/User_agent.php @@ -92,7 +92,7 @@ class CI_User_agent { { $_ua_path = APPPATH.'config/user_agents'.EXT; } - + if ( ! @include($_ua_path)) { return FALSE; |