diff options
| author | Greg Aker <greg@gregaker.net> | 2011-12-25 08:24:29 +0100 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-12-25 08:24:29 +0100 |
| commit | 5c1aa631c5f5ec2f6b75ba1158178418e50ba11a (patch) | |
| tree | 3dc36050275f67bbb7ba52f92d62609b12291369 /system/helpers/smiley_helper.php | |
| parent | 11ce5da8c743b5f6592c83a2b91e545d76a8789b (diff) | |
Abstracting the loading of files in the config directory depending on environments.
Diffstat (limited to 'system/helpers/smiley_helper.php')
| -rw-r--r-- | system/helpers/smiley_helper.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 38e2965fc..e04d5d611 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -241,14 +241,7 @@ if ( ! function_exists('_get_smiley_array')) { function _get_smiley_array() { - if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys.php')) - { - include(APPPATH.'config/'.ENVIRONMENT.'/smileys.php'); - } - elseif (file_exists(APPPATH.'config/smileys.php')) - { - include(APPPATH.'config/smileys.php'); - } + load_environ_config('smileys'); if (isset($smileys) AND is_array($smileys)) { |