From 58bedc8a310955dbc00e738bec1dc4f442eaff4e Mon Sep 17 00:00:00 2001 From: borekb Date: Wed, 30 Jan 2013 21:51:39 +0100 Subject: Updated idfilter() function for IIS There is a condition inside idfilter() function that helps Apache on Windows to properly handle colon as a namespace separator by replacing it with semicolon. However, this is not necessary on Microsoft IIS server so the condition was improved. --- inc/common.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'inc/common.php') diff --git a/inc/common.php b/inc/common.php index bc49e76b2..a270e4eaf 100644 --- a/inc/common.php +++ b/inc/common.php @@ -311,7 +311,7 @@ function breadcrumbs() { * * This is run on a ID before it is outputted somewhere * currently used to replace the colon with something else - * on Windows systems and to have proper URL encoding + * on Windows non-IIS systems and to have proper URL encoding * * Urlencoding is ommitted when the second parameter is false * @@ -322,7 +322,8 @@ 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, ':', ';'); } -- cgit v1.2.3