X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fencode%2Fiso_8859_7.php;h=9b2de332cd8ec2457859395e1a12febfb88e1cde;hp=188a610b667199a85bf9abde4db99a7f4e7dd277;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=4b4abf93a9624311afef0c385023724ee46a2b60

diff --git a/functions/encode/iso_8859_7.php b/functions/encode/iso_8859_7.php
index 188a610b..9b2de332 100644
--- a/functions/encode/iso_8859_7.php
+++ b/functions/encode/iso_8859_7.php
@@ -6,7 +6,7 @@
  * takes a string of unicode entities and converts it to a iso-8859-7 encoded string
  * Unsupported characters are replaced with ?.
  *
- * @copyright © 2004-2005 The SquirrelMail Project Team
+ * @copyright 2004-2018 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_7 ($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","unicodetoiso88597('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso88597(hexdec('\\1'))",$string);
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetoiso88597',$string);
 
     return $string;
 }
@@ -36,10 +35,11 @@ function charset_encode_iso_8859_7 ($string) {
  * Don't use it or make sure, that functions/encode/iso_8859_7.php is
  * included.
  *
- * @param int $var decimal unicode value
+ * @param array $matches array with first element a decimal unicode value
  * @return string iso-8859-7 character
  */
-function unicodetoiso88597($var) {
+function unicodetoiso88597($matches) {
+    $var = $matches[1];
 
     $iso88597chars=array('160' => "\xA0",
                          '163' => "\xA3",
@@ -140,4 +140,3 @@ function unicodetoiso88597($var) {
     }
     return $ret;
 }
-?>
\ No newline at end of file