summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-08-11 14:55:33 +0200
committerGitHub <noreply@github.com>2016-08-11 14:55:33 +0200
commitb7b5ee6bee6395460a7f628cb16f75b0777ea44b (patch)
tree784991ea4ddcef07c660c071c9fb652d5003ba00 /system/libraries
parentd864eb4828a1a4c327df1af4e84328a8dfd0be43 (diff)
parent669cc5f881970ec3cc19b57f4da0382c7d8f5542 (diff)
Merge pull request #4764 from butane/uri_scheme_case
URI schemes are not case-sensitive
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Form_validation.php7
-rw-r--r--system/libraries/Javascript.php4
2 files changed, 3 insertions, 8 deletions
diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 61f0298fd..86a569ced 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -1523,12 +1523,7 @@ class CI_Form_validation {
*/
public function prep_url($str = '')
{
- if ($str === 'http://' OR $str === '')
- {
- return '';
- }
-
- if (strpos($str, 'http://') !== 0 && strpos($str, 'https://') !== 0)
+ if ($str !== '' && 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);
}