summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2006-11-20 18:29:05 +0100
committerRick Ellis <rick.ellis@ellislab.com>2006-11-20 18:29:05 +0100
commit325197e700564f8e4e0ba7c9fc82abfd85f451b0 (patch)
treec109f0c96f187dc3b919aca591daf5767de4c982 /system/libraries
parentebfa686046bb98c757d1b41c81eb867478036e68 (diff)
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Exceptions.php6
-rw-r--r--system/libraries/Input.php6
-rw-r--r--system/libraries/User_agent.php1
3 files changed, 9 insertions, 4 deletions
diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php
index 8f90ff8f9..839093911 100644
--- a/system/libraries/Exceptions.php
+++ b/system/libraries/Exceptions.php
@@ -30,6 +30,7 @@ class CI_Exceptions {
var $message;
var $filename;
var $line;
+ var $ob_level;
var $levels = array(
E_ERROR => 'Error',
@@ -53,6 +54,7 @@ class CI_Exceptions {
*/
function CI_Exceptions()
{
+ $this->ob_level = ob_get_level();
// Note: Do not log messages from this constructor.
}
@@ -115,7 +117,7 @@ class CI_Exceptions {
{
$message = '<p>'.implode('</p><p>', ( ! is_array($message)) ? array($message) : $message).'</p>';
- if (ob_get_level() > 1)
+ if (ob_get_level() > $this->ob_level + 1)
{
ob_end_flush();
}
@@ -151,7 +153,7 @@ class CI_Exceptions {
$filepath = $x[count($x)-2].'/'.end($x);
}
- if (ob_get_level() > 1)
+ if (ob_get_level() > $this->ob_level + 1)
{
ob_end_flush();
}
diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index b630bf6b8..801762073 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -73,13 +73,15 @@ class CI_Input {
{
if ( ! is_array($global))
{
- unset($$global);
+ global $global;
+ $$global = NULL;
}
else
{
foreach ($global as $key => $val)
{
- unset($$key);
+ global $$key;
+ $$key = NULL;
}
}
}
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 8d160672f..95eccd124 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -186,6 +186,7 @@ class CI_User_agent {
$this->is_browser = TRUE;
$this->version = $match[1];
$this->browser = $val;
+ $this->_set_mobile();
return TRUE;
}
}