Merge branch 'master' of git://github.com/borekb/dokuwiki into pull-request-84

* 'master' of git://github.com/borekb/dokuwiki:
  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.

Conflicts:
	inc/common.php

1 files changed, 3 insertions, 1 deletions

diff --git a/inc/common.php b/inc/common.php
index 20baed6c0..3c40a47dc 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -320,13 +320,15 @@ 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') === 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;