X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fencode%2Fiso_8859_1.php;h=c2e31d99e6b0cb582ce6d44bc5ce26e75812cd5d;hb=22387c8d44f3ab104db6e19180d3775a45762359;hp=b65ff5acc7bf4c52b73e8137614c4498ff15362d;hpb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4;p=squirrelmail.git

diff --git a/functions/encode/iso_8859_1.php b/functions/encode/iso_8859_1.php
index b65ff5ac..c2e31d99 100644
--- a/functions/encode/iso_8859_1.php
+++ b/functions/encode/iso_8859_1.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
  * iso-8859-1 encoding functions
  *
  * takes a string of unicode entities and converts it to a iso-8859-1 encoded string
  * Unsupported characters are replaced with ?.
  *
+ * @copyright 2004-2017 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
- * @copyright Copyright &copy; 2004-2005 The SquirrelMail Project Team
  * @package squirrelmail
  * @subpackage encode
  */
@@ -20,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;
 }
@@ -30,14 +31,15 @@ function charset_encode_iso_8859_1 ($string) {
  * Return iso-8859-1 symbol when unicode character number is provided
  *
  * This function is used internally by charset_encode_iso_8859_1
- * function. It might be unavailable to other squirrelmail functions.
+ * function. It might be unavailable to other SquirrelMail functions.
  * 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);
@@ -46,4 +48,3 @@ function unicodetoiso88591($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file