Merged changes from mai trunk up to 2.3.1

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

diff --git a/includes/errors.inc b/includes/errors.inc
index f55951cf4652c1cc69d4f8f0a2bb0c070fc71626..7654ba70e676320c24f1ea088bfc83293f97f814 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -21,7 +21,10 @@ function error_handler($errno, $errstr, $file, $line) {
 
        // skip well known warnings we don't care about.
        // Please use restrainedly to not risk loss of important messages
-       $excluded_warnings = array('html_entity_decode', 'htmlspecialchars');
+       $excluded_warnings = array(
+               'html_entity_decode', 'htmlspecialchars',       // nevermind encodings, special chars are processed anyway
+               'should be compatible with that'                        // ignore cpdf/frontreport wrapper warnings
+       );
        foreach($excluded_warnings as $ref) {
                if (strpos($errstr, $ref) !== false) {
                        return true;