summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWes Baker <wes@wesbaker.com>2013-07-08 23:25:20 +0200
committerWes Baker <wes@wesbaker.com>2013-07-08 23:25:20 +0200
commit763e0bac83767dc2b8ae2c92192580a95121a624 (patch)
tree54bd9036428d56e0e5c0c1cd2f5612f64ab4871e
parentc5f99fdcc5c4a918b5b8fe3ddbd56ab25ad1c22b (diff)
Revert "Updating User Guide for 2.1.4."
This reverts commit c5f99fdcc5c4a918b5b8fe3ddbd56ab25ad1c22b. Signed-off-by: Wes Baker <wes@wesbaker.com>
-rw-r--r--application/controllers/welcome.php9
-rwxr-xr-xsystem/core/Security.php2
2 files changed, 3 insertions, 8 deletions
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index e4570974f..21bef43d9 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -7,10 +7,10 @@ class Welcome extends CI_Controller {
*
* Maps to the following URL
* http://example.com/index.php/welcome
- * - or -
+ * - or -
* http://example.com/index.php/welcome/index
* - or -
- * Since this controller is set as the default controller in
+ * Since this controller is set as the default controller in
* config/routes.php, it's displayed at http://example.com/
*
* So any other public methods not prefixed with an underscore will
@@ -21,11 +21,6 @@ class Welcome extends CI_Controller {
{
$this->load->view('welcome_message');
}
-
- public function test()
- {
- var_dump($this->security->xss_clean("<img src=\"a\" onerror='eval(atob(\"cHJvbXB0KDEpOw==\"))'"));
- }
}
/* End of file welcome.php */
diff --git a/system/core/Security.php b/system/core/Security.php
index a7db5a46b..b0d39b981 100755
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -609,7 +609,7 @@ class CI_Security {
if ($is_image === TRUE)
{
/*
- * Adobe Photoshop puts XML metadata into JFIF images,
+ * Adobe Photoshop puts XML metadata into JFIF images,
* including namespacing, so we have to allow this for images.
*/
unset($evil_attributes[array_search('xmlns', $evil_attributes)]);