diff options
| author | Andrey Andreev <narf@bofh.bg> | 2011-12-25 14:53:24 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2011-12-25 14:53:24 +0100 |
| commit | d34686f1a5ef557e8022c81961ad179a88c347ae (patch) | |
| tree | 62c74b609e2093399abd5bc9af3934fb129cf33c /system/helpers/smiley_helper.php | |
| parent | a92b903c0e6c2faa2a9480e23e2d3e4b6308878f (diff) | |
| parent | a96ade374f28cdae97036fc253fd8b2a0e8dc81a (diff) | |
Merge upstream branch
Diffstat (limited to 'system/helpers/smiley_helper.php')
| -rw-r--r-- | system/helpers/smiley_helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 991495ee8..38e2965fc 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -243,7 +243,7 @@ if ( ! function_exists('_get_smiley_array')) { if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/smileys.php'); + include(APPPATH.'config/'.ENVIRONMENT.'/smileys.php'); } elseif (file_exists(APPPATH.'config/smileys.php')) { |