Merge pull request simplesamlphp#73 from thijskh/master

jaimeperez · jaimeperez · commit 404633d62c55 · 2014-05-12T14:25:04.000+02:00
Also check $errno against PHP's error_reporting.
diff --git a/www/_include.php b/www/_include.php
@@ -54,7 +54,7 @@ function SimpleSAML_error_handler($errno, $errstr, $errfile = NULL, $errline = 0
 	}
 
 
-	if ($errno & SimpleSAML_Utilities::$logMask) {
+	if ($errno & SimpleSAML_Utilities::$logMask || ! ($errno & error_reporting() )) {
 		/* Masked error. */
 		return FALSE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ function SimpleSAML_error_handler($errno, $errstr, $errfile = NULL, $errline = 0`
`54`	`54`	`}`
`55`	`55`
`56`	`56`
`57`		`- if ($errno & SimpleSAML_Utilities::$logMask) {`
	`57`	`+ if ($errno & SimpleSAML_Utilities::$logMask \|\| ! ($errno & error_reporting() )) {`
`58`	`58`	`/* Masked error. */`
`59`	`59`	`return FALSE;`
`60`	`60`	`}`