diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-11-08 20:38:53 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-11-08 20:38:53 +0100 |
| commit | 53b8ef524529e6ca9f32ad49d36c5140df84feb0 (patch) | |
| tree | 383e10c617709699ca9e275797e405afad458816 /system/helpers/smiley_helper.php | |
| parent | f6d9a7cff222f868312a6d4ae4e4050616acb9a7 (diff) | |
Polish docs for HTML, Inflector, Language, Number, Path, Security and Smiley helpers
Also fixed a DB_cache bug introduced in previous commit and removed an unused parameter in a smiley helper
Diffstat (limited to 'system/helpers/smiley_helper.php')
| -rw-r--r-- | system/helpers/smiley_helper.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php index 6ae8937ee..4b491758e 100644 --- a/system/helpers/smiley_helper.php +++ b/system/helpers/smiley_helper.php @@ -131,10 +131,9 @@ if ( ! function_exists('get_clickable_smileys')) * * @param string the URL to the folder containing the smiley images * @param array - * @param array * @return array */ - function get_clickable_smileys($image_url, $alias = '', $smileys = NULL) + function get_clickable_smileys($image_url, $alias = '') { // For backward compatibility with js_insert_smiley if (is_array($alias)) @@ -143,7 +142,7 @@ if ( ! function_exists('get_clickable_smileys')) } elseif (FALSE === ($smileys = _get_smiley_array())) { - return $smileys; + return FALSE; } // Add a trailing slash to the file path if needed |