Revert "Abstracting the loading of files in the config directory depending on environments."
This reverts commit 5c1aa631c5f5ec2f6b75ba1158178418e50ba11a.
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php
index e04d5d6..38e2965 100644
--- a/system/helpers/smiley_helper.php
+++ b/system/helpers/smiley_helper.php
@@ -241,7 +241,14 @@
{
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))
{