diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-08-22 13:13:54 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-08-22 13:14:35 +0200 |
| commit | fa1ca8bdee7021a67f58a5278900266c16ef7cd7 (patch) | |
| tree | 80cfc0007fcfff68448dcb96b0b1e1df43b42e49 /system/core | |
| parent | c95df51c90dc9506ec9a37a43d87238965210550 (diff) | |
Merge pull request #4780 from tianhe1986/develop_standard_hex2bin
[ci skip] Trigger error for "resource" type in hex2bin() inputs
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/compat/standard.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/compat/standard.php b/system/core/compat/standard.php index c839c9bc9..6b7caa485 100644 --- a/system/core/compat/standard.php +++ b/system/core/compat/standard.php @@ -153,7 +153,7 @@ if ( ! function_exists('hex2bin')) */ function hex2bin($data) { - if (in_array($type = gettype($data), array('array', 'double', 'object'), TRUE)) + if (in_array($type = gettype($data), array('array', 'double', 'object', 'resource'), TRUE)) { if ($type === 'object' && method_exists($data, '__toString')) { |