summaryrefslogtreecommitdiff
path: root/system/libraries/Kohana_PHP_Exception.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-12-21 20:05:27 -0800
committerBharat Mediratta <bharat@menalto.com>2009-12-21 20:05:27 -0800
commit9285c8c66c530196399eb05bb5561c3fa5538335 (patch)
tree7cec68583c01b5b365e7669fefc1adc6360e89a5 /system/libraries/Kohana_PHP_Exception.php
parent9c5df1d31bd214fab051b71d092c751a1da20ecc (diff)
Updated Kohana to r4724
Diffstat (limited to 'system/libraries/Kohana_PHP_Exception.php')
-rw-r--r--system/libraries/Kohana_PHP_Exception.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Kohana_PHP_Exception.php b/system/libraries/Kohana_PHP_Exception.php
index fca5b30b..019c686b 100644
--- a/system/libraries/Kohana_PHP_Exception.php
+++ b/system/libraries/Kohana_PHP_Exception.php
@@ -2,7 +2,7 @@
/**
* Kohana PHP Error Exceptions
*
- * $Id: Kohana_PHP_Exception.php 4679 2009-11-10 01:45:52Z isaiah $
+ * $Id: Kohana_PHP_Exception.php 4687 2009-11-30 21:59:26Z isaiah $
*
* @package Core
* @author Kohana Team
@@ -89,7 +89,7 @@ class Kohana_PHP_Exception_Core extends Kohana_Exception {
*/
public static function shutdown_handler()
{
- if (Kohana_PHP_Exception::$enabled AND $error = error_get_last())
+ if (Kohana_PHP_Exception::$enabled AND $error = error_get_last() AND (error_reporting() & $error['type']))
{
// Fake an exception for nice debugging
Kohana_Exception::handle(new Kohana_PHP_Exception($error['type'], $error['message'], $error['file'], $error['line']));