diff options
| author | Greg Aker <greg@gregaker.net> | 2011-12-27 23:23:47 +0100 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-12-27 23:23:47 +0100 |
| commit | d96f88277c1e9a4c069c2e2ee3d779385549f31a (patch) | |
| tree | 5d3f9fb534ca9fa17635ddcd8c3d38abe51deec2 /system/helpers/smiley_helper.php | |
| parent | d459cbb96d9c9703ef6c62756240b7c612835e5c (diff) | |
Revert "Abstracting the loading of files in the config directory depending on environments."
This reverts commit 5c1aa631c5f5ec2f6b75ba1158178418e50ba11a.
Diffstat (limited to 'system/helpers/smiley_helper.php')
| -rw-r--r-- | system/helpers/smiley_helper.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index e04d5d611..38e2965fc 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -241,7 +241,14 @@ if ( ! function_exists('_get_smiley_array')) { function _get_smiley_array() { - load_environ_config('smileys'); + 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'); + } if (isset($smileys) AND is_array($smileys)) { |