load config files from environment specific locations in core classes, helpers and libraries
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php
index 463881f..6c90151 100644
--- a/system/helpers/smiley_helper.php
+++ b/system/helpers/smiley_helper.php
@@ -229,13 +229,20 @@
{
function _get_smiley_array()
{
- if ( ! file_exists(APPPATH.'config/smileys'.EXT))
+ if ( ! file_exists(APPPATH.'config/smileys'.EXT) AND ! file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys'.EXT))
{
return FALSE;
}
- include(APPPATH.'config/smileys'.EXT);
-
+ if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys'.EXT))
+ {
+ include(APPPATH.'config/'.ENVIRONMENT.'/smileys'.EXT);
+ }
+ else
+ {
+ include(APPPATH.'config/smileys'.EXT);
+ }
+
if ( ! isset($smileys) OR ! is_array($smileys))
{
return FALSE;