Permalink
Browse files

While most of CodeIgniter supports protocol-relative URLs, a few URL …

…helpers do not.

Most notably, redirect('//www.facebook.com/aaronadams') led my browser to https://aaronadams.ca/index.php/www.facebook.com/aaronadams.

In this commit, I have fixed the header() helper, along with the anchor() and anchor_popup() helpers, to be compatible with protocol-relative URLs.

Signed-off-by: Aaron Adams <aaron@aaronadams.ca>
  • Loading branch information...
1 parent 5c54f18 commit 16800e4e356fa1aa3d92d368e6e495b97b64ad83 @aaronadamsTO aaronadamsTO committed Dec 8, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 system/helpers/url_helper.php
@@ -152,7 +152,7 @@ function anchor($uri = '', $title = '', $attributes = '')
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 @@ function anchor($uri = '', $title = '', $attributes = '')
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 @@ function url_title($str, $separator = '-', $lowercase = FALSE)
*/
function redirect($uri = '', $method = 'auto', $code = NULL)
{
- if ( ! preg_match('#^https?://#i', $uri))
+ if ( ! preg_match('#^(\w+:)?//#i', $uri))
{
$uri = site_url($uri);
}

0 comments on commit 16800e4

Please sign in to comment.