X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=inline;f=functions%2Fencode%2Fiso_8859_1.php;h=15b6f1be0edc90ea89320c6ad01b63c970f2767c;hb=c4faef335b2362c81b8ebf026d4066c12d70536c;hp=e4439740952ecdec7c41039b12814118ceca6d56;hpb=30460a05016c7e066ad7b28df7788539e4054a99;p=squirrelmail.git

diff --git a/functions/encode/iso_8859_1.php b/functions/encode/iso_8859_1.php
index e4439740..15b6f1be 100644
--- a/functions/encode/iso_8859_1.php
+++ b/functions/encode/iso_8859_1.php
@@ -6,7 +6,7 @@
  * takes a string of unicode entities and converts it to a iso-8859-1 encoded string
  * Unsupported characters are replaced with ?.
  *
- * @copyright 2004-2009 The SquirrelMail Project Team
+ * @copyright 2004-2020 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -22,8 +22,7 @@ function charset_encode_iso_8859_1 ($string) {
    // don't run encoding function, if there is no encoded characters
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
-    $string=preg_replace("/&#([0-9]+);/e","unicodetoiso88591('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso88591(hexdec('\\1'))",$string);
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetoiso88591',$string);
 
     return $string;
 }
@@ -36,10 +35,11 @@ function charset_encode_iso_8859_1 ($string) {
  * Don't use it or make sure, that functions/encode/iso_8859_1.php is
  * included.
  *
- * @param int $var decimal unicode value
+ * @param array $matches array with first element a decimal unicode value
  * @return string iso-8859-1 character
  */
-function unicodetoiso88591($var) {
+function unicodetoiso88591($matches) {
+    $var = $matches[1];
 
     if ($var < 256) {
         $ret = chr ($var);