update to CI 2.0.2

Signed-off-by: Florian Pritz <bluewind@server-speed.net>

1 files changed, 12 insertions, 10 deletions

diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php
index 80a8d79ad..a2d1031b3 100755
--- a/system/helpers/smiley_helper.php
+++ b/system/helpers/smiley_helper.php
@@ -59,7 +59,7 @@ if ( ! function_exists('smiley_js'))
 
 				if (is_array($alias))
 				{
-					foreach($alias as $name => $id)
+					foreach ($alias as $name => $id)
 					{
 						$m[] = '"'.$name.'" : "'.$id.'"';
 					}
@@ -101,7 +101,7 @@ EOF;
 		{
 			if (is_array($alias))
 			{
-				foreach($alias as $name => $id)
+				foreach ($alias as $name => $id)
 				{
 					$r .= 'smiley_map["'.$name.'"] = "'.$id.'";'."\n";
 				}
@@ -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;
 	}
 }