X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fencode%2Fiso_8859_15.php;h=93540db37d7abccdac076b4e6ca38394b5675f9a;hb=77a1e3d10b0fe8a81bd645e3797d425839592954;hp=66fc9a8d17756a7c0294e3b130863e8f2703b1af;hpb=91e0dccca7b2452d8b450791cae3aa4125e8889e;p=squirrelmail.git

diff --git a/functions/encode/iso_8859_15.php b/functions/encode/iso_8859_15.php
index 66fc9a8d..93540db3 100644
--- a/functions/encode/iso_8859_15.php
+++ b/functions/encode/iso_8859_15.php
@@ -1,12 +1,14 @@
 <?php
+
 /**
  * iso-8859-15 encoding functions
  *
  * takes a string of unicode entities and converts it to a iso-8859-15 encoded string
  * Unsupported characters are replaced with ?.
  *
+ * @copyright 2004-2022 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
- * @copyright Copyright &copy; SquirrelMail Development Team, 2004
  * @package squirrelmail
  * @subpackage encode
  */
@@ -20,8 +22,7 @@ function charset_encode_iso_8859_15 ($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","unicodetoiso885915('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso885915(hexdec('\\1'))",$string);
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetoiso885915',$string);
 
     return $string;
 }
@@ -30,14 +31,15 @@ function charset_encode_iso_8859_15 ($string) {
  * Return iso-8859-15 symbol when unicode character number is provided
  *
  * This function is used internally by charset_encode_iso_8859_15
- * 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_15.php is
  * included.
  *
- * @param int $var decimal unicode value
+ * @param array $matches array with first element a decimal unicode value
  * @return string iso-8859-15 character
  */
-function unicodetoiso885915($var) {
+function unicodetoiso885915($matches) {
+    $var = $matches[1];
 
     $iso885915chars=array('160' => "\xA0",
                           '161' => "\xA1",
@@ -143,4 +145,3 @@ function unicodetoiso885915($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file