diff options
| author | Andrey Andreev <narf@bofh.bg> | 2013-01-28 10:00:02 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2013-01-28 10:00:02 +0100 |
| commit | db529ca1e13e9f9e1c73be20c3b92a7adc3c6aa2 (patch) | |
| tree | d4f4ecff21af8f6e09eb764546b8bdb02646148a /system/helpers | |
| parent | 1b74e70c0cfd3aedcfa427b655e2ad3868bff531 (diff) | |
Remove unnecessary defined('ENVIRONMENT') checks
As suggested in issue #2134 & PR #2149
Diffstat (limited to 'system/helpers')
| -rw-r--r-- | system/helpers/html_helper.php | 2 | ||||
| -rw-r--r-- | system/helpers/smiley_helper.php | 2 | ||||
| -rw-r--r-- | system/helpers/text_helper.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index 2d474169b..7a71eb82b 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -242,7 +242,7 @@ if ( ! function_exists('doctype')) if ( ! is_array($_doctypes)) { - if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php')) + if (is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php')) { include(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php'); } diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 186b24ce9..c2f50ec73 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -213,7 +213,7 @@ if ( ! function_exists('_get_smiley_array')) */ function _get_smiley_array() { - if (defined('ENVIRONMENT') && file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys.php')) + if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys.php')) { include(APPPATH.'config/'.ENVIRONMENT.'/smileys.php'); } diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index 1c7eeaf5f..c255c15a8 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -367,7 +367,7 @@ if ( ! function_exists('convert_accented_characters')) if ( ! isset($foreign_characters) OR ! is_array($foreign_characters)) { - if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars.php')) + if (is_file(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars.php')) { include(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars.php'); } |