Remove use of deprecated /e modifier in preg_replace.

[squirrelmail.git] / functions / encode / us_ascii.php

diff --git a/functions/encode/us_ascii.php b/functions/encode/us_ascii.php
index e870b9ff9036292dc061e884ecb83a5ce02d92eb..7c7d721ea5c9a897cddd346ad621e3dbc6cb88af 100644 (file)
--- a/functions/encode/us_ascii.php
+++ b/functions/encode/us_ascii.php
@@ -22,7 +22,7 @@ function charset_encode_us_ascii ($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","unicodetousascii('\\1')",$string);
+    $string=preg_replace_callback("/&#([0-9]+);/",'unicodetousascii',$string);
 
     return $string;
 }
@@ -35,10 +35,11 @@ function charset_encode_us_ascii ($string) {
  * Don't use it or make sure, that functions/encode/us_ascii.php is
  * included.
  *
- * @param int $var decimal unicode value
+ * @param array $matches array with first element a decimal unicode value
  * @return string us-ascii character
  */
-function unicodetousascii($var) {
+function unicodetousascii($matches) {
+    $var = $matches[1];
 
     if ($var < 128) {
         $ret = chr ($var);