diff options
Diffstat (limited to 'system/helpers/smiley_helper.php')
| -rw-r--r-- | system/helpers/smiley_helper.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 463881f58..a2d1031b3 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -229,19 +229,21 @@ if ( ! function_exists('_get_smiley_array')) { function _get_smiley_array() { - if ( ! file_exists(APPPATH.'config/smileys'.EXT)) + if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys'.EXT)) { - return FALSE; + include(APPPATH.'config/'.ENVIRONMENT.'/smileys'.EXT); } - - include(APPPATH.'config/smileys'.EXT); - - if ( ! isset($smileys) OR ! is_array($smileys)) + elseif (file_exists(APPPATH.'config/smileys'.EXT)) + { + include(APPPATH.'config/smileys'.EXT); + } + + if (isset($smileys) AND is_array($smileys)) { - return FALSE; + return $smileys; } - return $smileys; + return FALSE; } } |