projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsf changes, meant to be rebased on upstream
[squirrelmail.git]
/
functions
/
encode
/
iso_8859_15.php
diff --git
a/functions/encode/iso_8859_15.php
b/functions/encode/iso_8859_15.php
index 8d228bc45e43106e286dc07ac9b67fb0d21debd9..7e28c485b9f9702df3fe81d7b8e43f5cb5958c5d 100644
(file)
--- a/
functions/encode/iso_8859_15.php
+++ b/
functions/encode/iso_8859_15.php
@@
-6,7
+6,7
@@
* takes a string of unicode entities and converts it to a iso-8859-15 encoded string
* Unsupported characters are replaced with ?.
*
* takes a string of unicode entities and converts it to a iso-8859-15 encoded string
* Unsupported characters are replaced with ?.
*
- * @copyright
© 2004-2005
The SquirrelMail Project Team
+ * @copyright
2004-2021
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
@@
-22,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;
// 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;
}
return $string;
}
@@
-36,10
+35,11
@@
function charset_encode_iso_8859_15 ($string) {
* Don't use it or make sure, that functions/encode/iso_8859_15.php is
* included.
*
* 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
*/
* @return string iso-8859-15 character
*/
-function unicodetoiso885915($var) {
+function unicodetoiso885915($matches) {
+ $var = $matches[1];
$iso885915chars=array('160' => "\xA0",
'161' => "\xA1",
$iso885915chars=array('160' => "\xA0",
'161' => "\xA1",
@@
-145,4
+145,3
@@
function unicodetoiso885915($var) {
}
return $ret;
}
}
return $ret;
}
-?>
\ No newline at end of file