From 888b1fa227d24e32e38acaae03250145b8703936 Mon Sep 17 00:00:00 2001 From: izmeez Date: Fri, 6 Dec 2013 08:57:28 -0800 Subject: [PATCH] Issue #1954296 by Zaiten, izmeez: Updated patch to suppress php 5.4 strict warnings. --- includes/common.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/common.inc b/includes/common.inc index 61a3bac..61e1ee9 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -665,7 +665,11 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) { return; } - if ($errno & (E_ALL ^ E_DEPRECATED)) { + $error_const = E_ALL ^ E_DEPRECATED ^ E_NOTICE ^ E_STRICT; + if (version_compare(phpversion(), '5.4.0') < 0) { + $error_const = E_ALL ^ E_DEPRECATED ^ E_NOTICE; + } + if ($errno & $error_const) { $types = array(1 => 'error', 2 => 'warning', 4 => 'parse error', 8 => 'notice', 16 => 'core error', 32 => 'core warning', 64 => 'compile error', 128 => 'compile warning', 256 => 'user error', 512 => 'user warning', 1024 => 'user notice', 2048 => 'strict warning', 4096 => 'recoverable fatal error'); // For database errors, we want the line number/file name of the place that -- 1.7.9.5