X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fdecode%2Fiso_8859_1.php;h=3b182fdc2572d7215242b576d7abe6c382467271;hp=8675c99fba12f024f332f97bfe24e6c50c934a18;hb=5e5daa47f6270e55903f95fb3deff491fde2d6f5;hpb=47ccfad452e8d345542d09e59112cac317cffed8 diff --git a/functions/decode/iso_8859_1.php b/functions/decode/iso_8859_1.php index 8675c99f..3b182fdc 100644 --- a/functions/decode/iso_8859_1.php +++ b/functions/decode/iso_8859_1.php @@ -6,7 +6,7 @@ * This file contains iso-8859-1 decoding function that is needed to read * iso-8859-1 encoded mails in non-iso-8859-1 locale. * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright 2003-2015 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail @@ -23,13 +23,15 @@ function charset_decode_iso_8859_1 ($string) { if (! sq_is8bit($string,'iso-8859-1')) return $string; - $string = preg_replace("/([\201-\237])/e","'&#' . ord('\\1') . ';'",$string); + $string = preg_replace_callback("/([\201-\237])/", + create_function ('$matches', 'return \'&#\' . ord($matches[1]) . \';\';'), + $string); /* I don't want to use 0xA0 (\240) in any ranges. RH73 may dislike it */ $string = str_replace("\240", ' ', $string); - $string = preg_replace("/([\241-\377])/e","'&#' . ord('\\1') . ';'",$string); + $string = preg_replace_callback("/([\241-\377])/", + create_function ('$matches', 'return \'&#\' . ord($matches[1]) . \';\';'), + $string); return $string; } - -?> \ No newline at end of file