summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-08-01 15:09:35 +0200
committerAndrey Andreev <narf@bofh.bg>2012-08-01 15:09:35 +0200
commit894b7433cdab3ccb1577f2696a31d7b7a9ebb20d (patch)
treed2ede4510831291990a0cc265a5d0610565fdb8c /system/libraries
parent919717d7125673ee41c60a0317291cb9c23cb2a9 (diff)
Style fix and changelog entry for pull #1675
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 0e0bde97f..882a82c1f 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) || is_object($val))
+ if (is_array($val) OR is_object($val))
{
$val = print_r($val, TRUE);
}