Fixing CakeLog::handleError() being called too often.

Adding a PHP5 conditional, so custom error handlers are not called for errors not in the configured masking. Fixes #1735
cakephp · May 28, 2011 · b64b121 · b64b121
1 parent 5fd1926
commit b64b121
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/cake/libs/cake_log.php b/cake/libs/cake_log.php
@@ -288,5 +288,9 @@ function handleError($code, $description, $file = null, $line = null, $context =
 
 if (!defined('DISABLE_DEFAULT_ERROR_HANDLING')) {
 	$cakeLog =& CakeLog::getInstance();
-	set_error_handler(array($cakeLog, 'handleError'));
+	if (PHP5) {
+		set_error_handler(array($cakeLog, 'handleError'), error_reporting());
+	} else {
+		set_error_handler(array($cakeLog, 'handleError'));
+	}
 }
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
@@ -123,14 +123,15 @@ function write($config, $value = null) {
 			}
 
 			if (isset($_this->log) && $_this->log) {
-				if (!class_exists('CakeLog')) {
-					require LIBS . 'cake_log.php';
-				}
 				if (is_integer($_this->log) && !$_this->debug) {
 					$reporting = $_this->log;
 				} else {
 					$reporting = E_ALL & ~E_DEPRECATED;
 				}
+				error_reporting($reporting);
+				if (!class_exists('CakeLog')) {
+					require LIBS . 'cake_log.php';
+				}
 			}
 			error_reporting($reporting);
 		}
@@ -1317,4 +1318,4 @@ function __destruct() {
 			Cache::write('object_map', $this->__objects, '_cake_core_');
 		}
 	}
-}
+}