diff options
| author | Eric Barnes <eric@ericlbarnes.com> | 2011-10-17 14:42:09 +0200 |
|---|---|---|
| committer | Eric Barnes <eric@ericlbarnes.com> | 2011-10-17 14:42:09 +0200 |
| commit | 112e2bebadc0abe346bb1dffddc150421ebb0862 (patch) | |
| tree | fb4feea0fcd46e34ab92c8871707e4626df4daf1 /system | |
| parent | 43ded090371c42e99b0f104de62cc284fd332c4e (diff) | |
| parent | 3ad3503ba56e1a3824ce19a3ce213eaaad7ffe8f (diff) | |
Merge pull request #586 from blasto333/develop
Check for string value before doing str_replace. (Issue #439)
Diffstat (limited to 'system')
| -rw-r--r-- | system/libraries/Session.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/system/libraries/Session.php b/system/libraries/Session.php index dd951c325..867314bf9 100644 --- a/system/libraries/Session.php +++ b/system/libraries/Session.php @@ -749,7 +749,10 @@ class CI_Session { */ function _unescape_slashes(&$val, $key) { - $val= str_replace('{{slash}}', '\\', $val); + if (is_string($val)) + { + $val= str_replace('{{slash}}', '\\', $val); + } } // -------------------------------------------------------------------- |