summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/common.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/inc/common.php b/inc/common.php
index 0c769c50d..26904dd46 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -323,12 +323,14 @@ function idfilter($id,$ue=true){
if ($conf['useslash'] && $conf['userewrite']){
$id = strtr($id,':','/');
}elseif (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' &&
- $conf['userewrite']) {
+ $conf['userewrite'] &&
+ strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') === false) {
$id = strtr($id,':',';');
}
if($ue){
$id = rawurlencode($id);
$id = str_replace('%3A',':',$id); //keep as colon
+ $id = str_replace('%3B',';',$id); //keep as semicolon
$id = str_replace('%2F','/',$id); //keep as slash
}
return $id;