summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorVivek Dinesh <vivekdinesh5@gmail.com>2016-08-11 14:10:45 +0200
committerVivek Dinesh <vivekdinesh5@gmail.com>2016-08-11 14:10:45 +0200
commitb6ed3d102dc7c8e2a591405e56aa780d64d385d6 (patch)
treee305ae8a96c1bc7483317114339b53fa6472efe8 /system
parentc82e9968326b949d4cdad384f4645b28fa7c2f17 (diff)
URI schemes are not case-sensitive
Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
Diffstat (limited to 'system')
-rw-r--r--system/helpers/url_helper.php2
-rw-r--r--system/libraries/Form_validation.php4
-rw-r--r--system/libraries/Javascript.php4
3 files changed, 5 insertions, 5 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index fd7b5e116..82b9e02af 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -443,7 +443,7 @@ if ( ! function_exists('prep_url'))
*/
function prep_url($str = '')
{
- if ($str === 'http://' OR $str === '')
+ if (strtolower($str) === 'http://' OR $str === '')
{
return '';
}
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 61f0298fd..fa28a6207 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1523,12 +1523,12 @@ class CI_Form_validation {
*/
public function prep_url($str = '')
{
- if ($str === 'http://' OR $str === '')
+ if (strtolower($str) === 'http://' OR $str === '')
{
return '';
}
- if (strpos($str, 'http://') !== 0 && strpos($str, 'https://') !== 0)
+ if (stripos($str, 'http://') !== 0 && stripos($str, 'https://') !== 0)
{
return 'http://'.$str;
}
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php
index dcf933779..2ddab38ee 100644
--- a/system/libraries/Javascript.php
+++ b/system/libraries/Javascript.php
@@ -650,11 +650,11 @@ class CI_Javascript {
$this->_javascript_location = $this->CI->config->item('javascript_location');
}
- if ($relative === TRUE OR strpos($external_file, 'http://') === 0 OR strpos($external_file, 'https://') === 0)
+ if ($relative === TRUE OR stripos($external_file, 'http://') === 0 OR stripos($external_file, 'https://') === 0)
{
$str = $this->_open_script($external_file);
}
- elseif (strpos($this->_javascript_location, 'http://') !== FALSE)
+ elseif (stripos($this->_javascript_location, 'http://') !== FALSE)
{
$str = $this->_open_script($this->_javascript_location.$external_file);
}