summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorCristian Kocza <cristik@cristik.com>2014-02-19 20:52:38 +0100
committerCristian Kocza <cristik@cristik.com>2014-02-19 20:52:38 +0100
commit2be27448ade5e3a535b636f4fb69b1b06973551e (patch)
tree87035add86686bb9a61ac573dde0b3287fed9019 /system/core
parentfed4ab48a3c99140ecf904fc68ce6b84185bbb67 (diff)
Moved $_error load statement lower.
This prevents a possible recursion when an error is trigerred by one of the config file. Also since the variable is used only later in the code it makes sense to move it lower.
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Common.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 16a916a01..c83d80a3d 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -587,9 +587,7 @@ if ( ! function_exists('_exception_handler'))
if ($is_error)
{
set_status_header(500);
- }
-
- $_error =& load_class('Exceptions', 'core');
+ }
// Should we ignore the error? We'll get the current error_reporting
// level and add its bits with the severity bits to find out.
@@ -598,6 +596,7 @@ if ( ! function_exists('_exception_handler'))
return;
}
+ $_error =& load_class('Exceptions', 'core');
$_error->log_exception($severity, $message, $filepath, $line);
// Should we display the error?