diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-06-04 16:28:23 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-06-04 16:28:23 +0200 |
| commit | 3902e383b41c6c0ef77b65e95d451cb2ea3d85db (patch) | |
| tree | eb2adb1cf4f1dea1e4d14c69a3f1a275b14cff08 /system/helpers/smiley_helper.php | |
| parent | fd2ceab417bbb696134910ce0eaeca34bea3e1e5 (diff) | |
| parent | fc11dcc82cefa7299e6f8c74d0e005ebb6fa568c (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/helpers/smiley_helper.php')
| -rw-r--r-- | system/helpers/smiley_helper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 5e6de08af..b6b2afcf4 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -55,7 +55,7 @@ if ( ! function_exists('smiley_js')) static $do_setup = TRUE; $r = ''; - if ($alias != '' && ! is_array($alias)) + if ($alias !== '' && ! is_array($alias)) { $alias = array($alias => $field_id); } @@ -184,7 +184,7 @@ if ( ! function_exists('parse_smileys')) */ function parse_smileys($str = '', $image_url = '', $smileys = NULL) { - if ($image_url == '' OR ( ! is_array($smileys) && FALSE === ($smileys = _get_smiley_array()))) + if ($image_url === '' OR ( ! is_array($smileys) && FALSE === ($smileys = _get_smiley_array()))) { return $str; } |