summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-01-29 18:21:27 +0100
committerDerek Allard <derek.allard@ellislab.com>2008-01-29 18:21:27 +0100
commit0975bcc8d56392af3d07f1e2af941b727d6dc389 (patch)
treea6bf469f7f947abaa97e72b6449b6647a52c2b0a /system
parent9ece7433d90375a3ad67e1310e35e198a15645fe (diff)
Fixed a bug (#3328) where the smiley helper might return an undefined variable.
Diffstat (limited to 'system')
-rw-r--r--system/helpers/smiley_helper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php
index f4149478c..25962eb54 100644
--- a/system/helpers/smiley_helper.php
+++ b/system/helpers/smiley_helper.php
@@ -71,7 +71,7 @@ if (! function_exists('get_clickable_smileys'))
{
if (FALSE === ($smileys = _get_smiley_array()))
{
- return $str;
+ return $smileys;
}
}