From ba9d31a5fda79f8ec8e367300f2a0e85b093a124 Mon Sep 17 00:00:00 2001 From: Martin Kutschker Date: Mon, 16 Jul 2007 13:06:22 +0000 Subject: [PATCH] Correct last patch git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2421 709f56b5-9817-0410-a4d7-c38de5d9e867 --- t3lib/class.t3lib_div.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t3lib/class.t3lib_div.php b/t3lib/class.t3lib_div.php index 320073e0c106..4d1dacb16e70 100755 --- a/t3lib/class.t3lib_div.php +++ b/t3lib/class.t3lib_div.php @@ -4289,7 +4289,7 @@ class t3lib_div { if (strstr($line,'###')) return $line; // Check if any non-ASCII characters are found - otherwise encoding is not needed - if (!preg_match('/[^'.chr(32).'-'.chr(127).']/',$line) && ($enc=='base64' || strpos($line,'=?')===FALSE)) return $line; + if (!preg_match('/[^'.chr(32).'-'.chr(127).']/',$line)) return $line; // Wrap email addresses in a special marker $line = preg_replace('/([^ ]+@[^ ]+)/', '###$1###', $line); @@ -4457,6 +4457,7 @@ class t3lib_div { */ function sysLog($msg, $extKey, $severity=0) { global $TYPO3_CONF_VARS; + $severity = t3lib_div::intInRange($severity,0,4); // is message worth logging? -- 2.20.1