Merged changes form stabel branch up to the current state (2.3.22+).

[fa-stable.git] / includes / errors.inc

diff --git a/includes/errors.inc b/includes/errors.inc
index 86bfac2b0cd3fee9641c0c8bc188a2041e103a61..1102271b658094677b6522362ce5bcf942cb7431 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -62,7 +62,8 @@ function error_handler($errno, $errstr, $file, $line) {
        // Please use restrainedly to not risk loss of important messages
        $excluded_warnings = array(
                'html_entity_decode', 'htmlspecialchars',       // nevermind encodings, special chars are processed anyway
-               'should be compatible with that'                        // ignore cpdf/frontreport wrapper warnings
+               'should be compatible with that',                       // ignore cpdf/frontreport wrapper warnings
+               'mysql extension is deprecated'                         // ignore strict warning in 5.4
        );
        foreach($excluded_warnings as $ref) {
                if (strpos($errstr, $ref) !== false) {