diff options
| author | Florian Pritz <bluewind@xinu.at> | 2012-10-08 18:04:12 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2012-10-08 18:04:12 +0200 |
| commit | 74dcbbf816deb0cb05e43f1843f6b84b51966470 (patch) | |
| tree | b4ceb0a46fb54366d8943325d9e91895e78a03c0 /system/libraries/Profiler.php | |
| parent | b12d7cb03ab1ef63baab4a8d4b1380e6990c1437 (diff) | |
| parent | 05e8c03b6742033cf88885cb86217cadca3a4567 (diff) | |
Merge tag '2.1.3'
Conflicts:
user_guide
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/libraries/Profiler.php')
| -rwxr-xr-x | 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 082a5ee1d..882a82c1f 100755 --- 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) OR is_object($val)) { $val = print_r($val, TRUE); } |