summaryrefslogtreecommitdiffstats
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
parent919717d7125673ee41c60a0317291cb9c23cb2a9 (diff)
Style fix and changelog entry for pull #1675
-rw-r--r--system/libraries/Profiler.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 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);
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index bfca5a286..2bb3e6916 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -64,6 +64,7 @@ Change Log
<ul>
<li>Fixed a bug (#1543) - <a href="libraries/caching.html#file">File-based Caching</a> method <samp>get_metadata()</samp> used a non-existent array key to look for the TTL value.</li>
<li>Fixed a bug (#1314) - <a href="libraries/session.html">Session Library</a> method <samp>sess_destroy()</samp> didn't destroy the userdata array.
+ <li>Fixed a bug where the <a href="libraries/profiler.html">Profiler Library</a> issued an E_WARNING error if <a href="libraries/session.html">Session</a> userdata contains objects.</li>
</ul>
<h2>Version 2.1.2</h2>