diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-10-05 19:24:45 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-10-05 19:24:45 +0200 |
| commit | 044a5221843cc2d88b936f3e658a1df4bc28cfe2 (patch) | |
| tree | 9845376e277aa822c41835c8ca8bc94a4cf23756 /system/libraries/Profiler.php | |
| parent | 47a62548cfdcd5fb6588a2caa92d3b55ac05de6f (diff) | |
| parent | d1ecd5cd4ae6ab5d37df9fbda14b93977b9e743c (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Profiler.php')
| -rw-r--r-- | system/libraries/Profiler.php | 2 |
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); } |