summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-03-25 17:10:01 +0100
committerAndrey Andreev <narf@devilix.net>2015-03-25 17:10:01 +0100
commit343a3e948957daf16a9b25f79339abc00dd04db7 (patch)
treebff1d5e5bd1d2f2e3392993ce487c6d14c62ced3 /system
parentb112a3eb94d19f91ee3b698f43f36fd17a06d9c3 (diff)
parent362ff3ae4b6ce363c9cb07de682180bc447c8e28 (diff)
Merge pull request #3696 from logsdon/develop
Allow html_escape() to accept empty arrays
Diffstat (limited to 'system')
-rw-r--r--system/core/Common.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index ee5a705b2..f28272b5b 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -741,6 +741,11 @@ if ( ! function_exists('html_escape'))
*/
function html_escape($var, $double_encode = TRUE)
{
+ if (empty($var))
+ {
+ return $var;
+ }
+
if (is_array($var))
{
return array_map('html_escape', $var, array_fill(0, count($var), $double_encode));