mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Fix iconv bug, thanks to Matthias Leise

Browse Source
This commit is contained in:
Garvin Hicking
2006-08-05 20:59:00 +00:00
parent 1d2b48e906
commit 717022a81d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@@ -241,6 +241,9 @@ Version 1.1-alpha5()
Version 1.0.1 () Version 1.0.1 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Fix utf8 iconv conversion failing on some older PHP setups.
Thanks to Matthias Leisi!
* Fix multi-authors view only showing first author (garvinhicking) * Fix multi-authors view only showing first author (garvinhicking)
* Fix bug sending comment-notification mails to subscribed users * Fix bug sending comment-notification mails to subscribed users

7
include/functions.inc.php
View File

@@ -537,7 +537,12 @@ function serendipity_fetchReferences($id) {
function serendipity_utf8_encode($string) { function serendipity_utf8_encode($string) {
if (strtolower(LANG_CHARSET) != 'utf-8') { if (strtolower(LANG_CHARSET) != 'utf-8') {
if (function_exists('iconv')) { if (function_exists('iconv')) {
return iconv(LANG_CHARSET, 'UTF-8', $string); $new = iconv(LANG_CHARSET, 'UTF-8', $string);
if ($new !== false) {
return $new;
} else {
return utf8_encode($string);
}
} else if (function_exists('mb_convert_encoding')) { } else if (function_exists('mb_convert_encoding')) {
return mb_convert_encoding($string, 'UTF-8', LANG_CHARSET); return mb_convert_encoding($string, 'UTF-8', LANG_CHARSET);
} else { } else {