diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-10-12 16:16:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-10-12 16:16:35 +0200 |
| commit | 3013f53c59a5d2550a126b1493cf8262bd62dd53 (patch) | |
| tree | 772e9b569a65e8567c366671373a2700c2028445 /system/core/Config.php | |
| parent | 30f593bbb3408d0c076f2453818c68a7c5c59248 (diff) | |
| parent | 36a055e49b040e6f18be7bce5e010c2a90d2f44f (diff) | |
Merge branch '3.0-stable' into develop
Diffstat (limited to 'system/core/Config.php')
| -rw-r--r-- | system/core/Config.php | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index d07000ac9..feea7c85a 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -238,7 +238,15 @@ class CI_Config { if (isset($protocol)) { - $base_url = $protocol.substr($base_url, strpos($base_url, '://')); + // For protocol-relative links + if ($protocol === '') + { + $base_url = substr($base_url, strpos($base_url, '//')); + } + else + { + $base_url = $protocol.substr($base_url, strpos($base_url, '://')); + } } if (empty($uri)) @@ -293,7 +301,15 @@ class CI_Config { if (isset($protocol)) { - $base_url = $protocol.substr($base_url, strpos($base_url, '://')); + // For protocol-relative links + if ($protocol === '') + { + $base_url = substr($base_url, strpos($base_url, '//')); + } + else + { + $base_url = $protocol.substr($base_url, strpos($base_url, '://')); + } } return $base_url.ltrim($this->_uri_string($uri), '/'); |