diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-03-24 10:04:53 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-03-24 10:04:53 +0100 |
| commit | c7c0bdf4f7af7c4e71b073ee87ddb792087bdfac (patch) | |
| tree | 5cfb825e1e0d67f30d4c8a91428cd52eb580695a /system/helpers/html_helper.php | |
| parent | 1d9aaee34ea77fdb68d79d7add37f26dd2649c00 (diff) | |
| parent | 0eb38af2eaf1127b9b82261b7ec3bf4d4b847318 (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
system/core/CodeIgniter.php
system/core/Common.php
system/core/Input.php
system/helpers/cookie_helper.php
tests/codeigniter/helpers/html_helper_test.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
user_guide_src/source/libraries/input.rst
Diffstat (limited to 'system/helpers/html_helper.php')
| -rw-r--r-- | system/helpers/html_helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php index b5e8ed783..93ba2dd7d 100644 --- a/system/helpers/html_helper.php +++ b/system/helpers/html_helper.php @@ -192,7 +192,7 @@ if ( ! function_exists('img')) foreach ($src as $k => $v) { - if ($k === 'src' && ! preg_match('#^([a-z]+:)?//#i', $v)) + if ($k === 'src' && ! preg_match('#^(data:[a-z,;])|(([a-z]+:)?(?<!data:)//)#i', $v)) { if ($index_page === TRUE) { |