diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2008-01-29 18:21:27 +0100 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2008-01-29 18:21:27 +0100 |
| commit | 0975bcc8d56392af3d07f1e2af941b727d6dc389 (patch) | |
| tree | a6bf469f7f947abaa97e72b6449b6647a52c2b0a | |
| parent | 9ece7433d90375a3ad67e1310e35e198a15645fe (diff) | |
Fixed a bug (#3328) where the smiley helper might return an undefined variable.
| -rw-r--r-- | system/helpers/smiley_helper.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 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;
}
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 3ad46f016..ad6240946 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -163,6 +163,7 @@ Change Log <li>Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).</li>
<li>Removed an unused parameter from Profiler (#3332).</li>
<li>Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.</li>
+ <li>Fixed a bug (#3328) where the smiley helper might return an undefined variable.</li>
<li>Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.</li>
<li>Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.</li>
<li>Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.</li>
|