diff options
author | Andrey Andreev <narf@bofh.bg> | 2013-02-15 12:35:43 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2013-02-15 12:35:43 +0100 |
commit | 3ba26413f3fabe64f77f936a357845d118f950f5 (patch) | |
tree | 5abb111b5b6a1ecbe79720b37057df085bebad38 /system/libraries/Upload.php | |
parent | 3a533ac93a62f15c2abd186878238b0a99e10f88 (diff) | |
parent | 3567246091195e035ea4c8d3b2915eb6b45ad5e2 (diff) |
Merge pull request #2248 from vlakoff/develop
Various cosmetic fixes
Diffstat (limited to 'system/libraries/Upload.php')
-rw-r--r-- | system/libraries/Upload.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php index 814ea68a4..acd76b03b 100644 --- a/system/libraries/Upload.php +++ b/system/libraries/Upload.php @@ -430,7 +430,7 @@ class CI_Upload { } else { - // An extension was provided, lets have it! + // An extension was provided, let's have it! $this->file_ext = $this->get_extension($this->_file_name_override); } @@ -1050,7 +1050,7 @@ class CI_Upload { // <a, <body, <head, <html, <img, <plaintext, <pre, <script, <table, <title // title is basically just in SVG, but we filter it anyhow - // if its an image or no "triggers" detected in the first 256 bytes - we're good + // if it's an image or no "triggers" detected in the first 256 bytes - we're good return ! preg_match('/<(a|body|head|html|img|plaintext|pre|script|table|title)[\s>]/i', $opening_bytes); } |