projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy New Year
[squirrelmail.git]
/
functions
/
decode
/
iso_8859_1.php
diff --git
a/functions/decode/iso_8859_1.php
b/functions/decode/iso_8859_1.php
index 7d0ecef667b510eaff68f5610793048fee14a651..027cac69df7b5609e2c078ba43f185f38fe5f8c7 100644
(file)
--- 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.
*
* 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-2009
The SquirrelMail Project Team
+ * @copyright
2003-2018
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-23,11
+23,15
@@
function charset_decode_iso_8859_1 ($string) {
if (! sq_is8bit($string,'iso-8859-1'))
return $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);
/* 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;
}
return $string;
}