summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorBorek Bernard <borekb@gmail.com>2012-02-27 20:42:06 +0100
committerBorek Bernard <borekb@gmail.com>2012-02-27 20:42:06 +0100
commit15ae43bc55fffc8a9ccbf8215883532daf0d4a82 (patch)
tree197964a09fb704dc6aea652d50a303745c07a1e6 /inc
parent361171a4e89a313fae8aa823c2279b32ec0c08bc (diff)
downloadrpg-15ae43bc55fffc8a9ccbf8215883532daf0d4a82.tar.gz
rpg-15ae43bc55fffc8a9ccbf8215883532daf0d4a82.tar.bz2
Colon is no longer rewritten to semicolon for IIS 7.x and for older versions of IIS, semicolon is displayed as is, not URL-encoded.
Diffstat (limited to 'inc')
-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;