aboutsummaryrefslogtreecommitdiff
path: root/mod/file/actions
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-10-19 09:47:11 +0200
committerSem <sembrestels@riseup.net>2012-10-19 09:47:11 +0200
commit80ca3d447737a679f773cbea7e788ee190abea69 (patch)
tree62bd6ec58b5fc8ad02bd529d187591659dc39b65 /mod/file/actions
parent9a4ed2014e9880130c1bbc52bb980e44a488bad9 (diff)
parentd134beadb79fcc90a75bda8bbcbfb9987b27470c (diff)
downloadelgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.gz
elgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.bz2
Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod
Diffstat (limited to 'mod/file/actions')
-rw-r--r--mod/file/actions/file/upload.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php
index d72d04eb7..d6dce2528 100644
--- a/mod/file/actions/file/upload.php
+++ b/mod/file/actions/file/upload.php
@@ -6,7 +6,7 @@
*/
// Get variables
-$title = get_input("title");
+$title = htmlspecialchars(get_input('title', '', false), ENT_QUOTES, 'UTF-8');
$desc = get_input("description");
$access_id = (int) get_input("access_id");
$container_guid = (int) get_input('container_guid', 0);
@@ -44,7 +44,7 @@ if ($new_file) {
// if no title on new upload, grab filename
if (empty($title)) {
- $title = $_FILES['upload']['name'];
+ $title = htmlspecialchars($_FILES['upload']['name'], ENT_QUOTES, 'UTF-8');
}
} else {