projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy New Year
[squirrelmail.git]
/
functions
/
encode
/
cp1251.php
diff --git
a/functions/encode/cp1251.php
b/functions/encode/cp1251.php
index 93eabf24bdef5732a6852a441e39e79852951a7c..df43cec778402f31bdcd61e5ddc1e3f510f95475 100644
(file)
--- a/
functions/encode/cp1251.php
+++ b/
functions/encode/cp1251.php
@@
-6,7
+6,7
@@
* takes a string of unicode entities and converts it to a cp1251 encoded string
* Unsupported characters are replaced with ?.
*
* takes a string of unicode entities and converts it to a cp1251 encoded string
* Unsupported characters are replaced with ?.
*
- * @copyright 2004-20
1
0 The SquirrelMail Project Team
+ * @copyright 2004-20
2
0 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_cp1251 ($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","unicodetocp1251('\\1')",$string);
- // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetocp1251(hexdec('\\1'))",$string);
+ $string=preg_replace_callback("/&#([0-9]+);/", 'unicodetocp1251', $string);
return $string;
}
return $string;
}
@@
-36,10
+35,11
@@
function charset_encode_cp1251 ($string) {
* Don't use it or make sure, that functions/encode/cp1251.php is
* included.
*
* Don't use it or make sure, that functions/encode/cp1251.php is
* included.
*
- * @param
int $var
decimal unicode value
+ * @param
array $matches array with first element a
decimal unicode value
* @return string cp1251 character
*/
* @return string cp1251 character
*/
-function unicodetocp1251($var) {
+function unicodetocp1251($matches) {
+ $var = $matches[1];
$cp1251chars=array('160' => "\xA0",
'164' => "\xA4",
$cp1251chars=array('160' => "\xA0",
'164' => "\xA4",