summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorChris Muench <me@chrismuench.com>2011-10-17 05:03:55 +0200
committerEric Barnes <eric@ericlbarnes.com>2011-10-17 20:00:22 +0200
commit3e414f9f72e387449d9e3984e1869b386564deaf (patch)
tree260d211d66cd49a430b77658f59474e5d58f6548 /system
parent0cd4d6092f7591374ff22125430254da8b6e3bf1 (diff)
Check for string value before doing str_replace. (Issue #439)
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Session.php5
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);
+ }
}
// --------------------------------------------------------------------