Fix umlaut replacement to happen before all (UTF-8-)umlauts are stripped.
This commit is contained in:
@@ -121,13 +121,13 @@ function serendipity_makeFilename($str, $stripDots = false) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Replace international chars not detected by every locale
|
// Replace international chars not detected by every locale
|
||||||
|
$str = str_replace($from, $to, $str);
|
||||||
|
|
||||||
if (LANG_CHARSET == 'UTF-8') {
|
if (LANG_CHARSET == 'UTF-8') {
|
||||||
// URLs need to be 7bit - since this function takes care of the most common ISO-8859-1
|
// URLs need to be 7bit - since this function takes care of the most common ISO-8859-1
|
||||||
// characters, try to UTF8-decode the string first.
|
// characters, try to UTF8-decode the string first.
|
||||||
$str = utf8_decode($str);
|
$str = utf8_decode($str);
|
||||||
}
|
}
|
||||||
|
|
||||||
$str = str_replace($from, $to, $str);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Nuke chars not allowed in our URI
|
// Nuke chars not allowed in our URI
|
||||||
|
|||||||
Reference in New Issue
Block a user