summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-12-08 14:50:22 +0100
committerAndrey Andreev <narf@bofh.bg>2012-12-08 14:50:22 +0100
commit545a7c86701875e1412bcde316e9bcc76d9a23a0 (patch)
tree3ad3f05eea022a3369328d95a1a92c533f2ac1c6 /system/helpers
parentc1c99d5f8e6f2f58697b0de94e5445a092ca0562 (diff)
parent16800e4e356fa1aa3d92d368e6e495b97b64ad83 (diff)
Merge pull request #2059 from aaronadamsTO/develop
Fix URL helpers to recognize protocol-relative URLs.
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/url_helper.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 14c216afe..36ff0ff2c 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -152,7 +152,7 @@ if ( ! function_exists('anchor'))
if ( ! is_array($uri))
{
- $site_url = preg_match('!^\w+://! i', $uri) ? $uri : site_url($uri);
+ $site_url = preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri);
}
else
{
@@ -191,7 +191,7 @@ if ( ! function_exists('anchor_popup'))
function anchor_popup($uri = '', $title = '', $attributes = FALSE)
{
$title = (string) $title;
- $site_url = preg_match('!^\w+://! i', $uri) ? $uri : site_url($uri);
+ $site_url = preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri);
if ($title === '')
{
@@ -535,7 +535,7 @@ if ( ! function_exists('redirect'))
*/
function redirect($uri = '', $method = 'auto', $code = NULL)
{
- if ( ! preg_match('#^https?://#i', $uri))
+ if ( ! preg_match('#^(\w+:)?//#i', $uri))
{
$uri = site_url($uri);
}