- remove str_translate_to_ascii7bits and lang_table_translate_ascii7bits

git-svn-id: http://piwigo.org/svn/trunk@2122 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 5 insertions, 19 deletions

diff --git a/include/functions.inc.php b/include/functions.inc.php
index b58d67d78..a34215fd5 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1115,24 +1115,6 @@ function l10n_args($key_args, $sep = "\n")
 }
 
 /**
- * Translate string in string ascii7bits
- * It's possible to do that with iconv_substr
- * but this fonction is not avaible on all the providers.
- *
- * @param string str
- * @return string
- */
-function str_translate_to_ascii7bits($str)
-{
-  global $lang_table_translate_ascii7bits;
-
-  $src_table = array_keys($lang_table_translate_ascii7bits);
-  $dst_table = array_values($lang_table_translate_ascii7bits);
-
-  return str_replace($src_table , $dst_table, $str);
-}
-
-/**
  * returns the corresponding value from $themeconf if existing. Else, the
  * key is returned
  *
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index 19ec06ed7..a20a32797 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -106,7 +106,11 @@ function format_email($name, $email)
 
     if ($cvt_name!="")
     {
-      $cvt_name = encode_mime_header('"'.$cvt_name.'"').' ';
+      $cvt_name = encode_mime_header(
+                '"'
+                .addcslashes($cvt_name,'"')
+                .'"');
+      $cvt_name .= ' ';
     }
 
     if (strpos($cvt_email, '<') === false)