| commit | 343a3e948957daf16a9b25f79339abc00dd04db7 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Wed Mar 25 18:10:01 2015 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Wed Mar 25 18:10:01 2015 +0200 |
| tree | bff1d5e5bd1d2f2e3392993ce487c6d14c62ced3 | |
| parent | b112a3eb94d19f91ee3b698f43f36fd17a06d9c3 [diff] | |
| parent | 362ff3ae4b6ce363c9cb07de682180bc447c8e28 [diff] |
Merge pull request #3696 from logsdon/develop Allow html_escape() to accept empty arrays
diff --git a/system/core/Common.php b/system/core/Common.php index ee5a705..f28272b 100644 --- a/system/core/Common.php +++ b/system/core/Common.php
@@ -741,6 +741,11 @@ */ 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));