projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy 2017
[squirrelmail.git]
/
functions
/
encode
/
utf_8.php
diff --git
a/functions/encode/utf_8.php
b/functions/encode/utf_8.php
index 59cc51b1c447f41b2e27bf98ca778dcbbaa1a1b4..b99399759f6bb47dd8f58871c7327c02d36c30d4 100644
(file)
--- a/
functions/encode/utf_8.php
+++ b/
functions/encode/utf_8.php
@@
-10,7
+10,7
@@
* Original code is taken from www.php.net manual comments
* Original author: ronen at greyzone dot com
*
* Original code is taken from www.php.net manual comments
* Original author: ronen at greyzone dot com
*
- * @copyright 2004-201
2
The SquirrelMail Project Team
+ * @copyright 2004-201
7
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-26,8
+26,7
@@
function charset_encode_utf_8 ($string) {
// don't run encoding function, if there is no encoded characters
if (! preg_match("'&#[0-9]+;'",$string) ) return $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","unicodetoutf8('\\1')",$string);
- // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoutf8(hexdec('\\1'))",$string);
+ $string=preg_replace_callback("/&#([0-9]+);/",'unicodetoutf8',$string);
return $string;
}
return $string;
}
@@
-40,10
+39,11
@@
function charset_encode_utf_8 ($string) {
* Don't use it or make sure, that functions/encode/utf_8.php is
* included.
*
* Don't use it or make sure, that functions/encode/utf_8.php is
* included.
*
- * @param
int $var
decimal unicode value
+ * @param
array $matches array with first element a
decimal unicode value
* @return string utf8 character
*/
* @return string utf8 character
*/
-function unicodetoutf8($var) {
+function unicodetoutf8($matches) {
+ $var = $matches[1];
if ($var < 128) {
$ret = chr ($var);
if ($var < 128) {
$ret = chr ($var);