summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAlex Bilbie <alex@alexbilbie.com>2012-08-01 11:22:36 +0200
committerAlex Bilbie <alex@alexbilbie.com>2012-08-01 11:22:36 +0200
commit919717d7125673ee41c60a0317291cb9c23cb2a9 (patch)
tree9509c51095cbf557788656d05981b1de1a4ae80a /system/libraries
parent7af48d061b7b4250fdb54466655ad1067856d326 (diff)
parent38339acb3de57283a63a72b2febe43fef9411453 (diff)
Merge pull request #1675 from Dentxinho/patch-1
Fix warning by profiler when userdata has objects
Diffstat (limited to 'system/libraries')
-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 082a5ee1d..0e0bde97f 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);
}