summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-09-10 04:54:58 +0200
committerEric Barnes <eric@ericlbarnes.com>2011-09-10 04:54:58 +0200
commit715120e53d2950cbe6a2618740bac428a5869e20 (patch)
tree018169848df73c4c7a708562d1715eba1409d9dd /system
parent57ace979bec81528480d511e0ca24c70c6ce5359 (diff)
parent7fe625aa1b294d135c860a79830da12658238c7e (diff)
Merge pull request #389 from vjnrv/patch-1
CI_Profiler => Accepting objects while profiling session data.
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Profiler.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 330acce73..ac58129a9 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -506,7 +506,7 @@ class CI_Profiler {
foreach ($this->CI->session->all_userdata() as $key => $val)
{
- if (is_array($val))
+ if (is_array($val) || is_object($val))
{
$val = print_r($val, TRUE);
}