summaryrefslogtreecommitdiffstats
path: root/system/helpers/url_helper.php
diff options
context:
space:
mode:
authorAlex Bilbie <alex@alexbilbie.com>2012-09-19 17:17:18 +0200
committerAlex Bilbie <alex@alexbilbie.com>2012-09-19 17:17:18 +0200
commita434f90f1fb15abc494b18126dc3563f12d2b9b3 (patch)
treea80f7fe213c708c7282f2fbe791a5d7861dd5d32 /system/helpers/url_helper.php
parent935d42f91a55a409ca02857ef1ef660c921ff1db (diff)
parentc2300c827f769ecde286419fcab29c4ec9698822 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into codeigniter/develop
Diffstat (limited to 'system/helpers/url_helper.php')
-rw-r--r--system/helpers/url_helper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 57208c948..b1f5eccf1 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -534,7 +534,7 @@ if ( ! function_exists('redirect'))
}
// IIS environment likely? Use 'refresh' for better compatibility
- if (DIRECTORY_SEPARATOR !== '/' && $method === 'auto')
+ if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== FALSE)
{
$method = 'refresh';
}