summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorIndividual IT Services <info@individual-it.net>2015-09-14 15:56:53 +0545
committerIndividual IT Services <info@individual-it.net>2015-09-14 15:56:53 +0545
commit04db96adaf9faff80aaf26c181215d9986c97263 (patch)
tree8e6a9623067f8c359212aeed8547dddd1c65cea7 /apps
parent211a2437840ec6897e377a5025f85aec27618263 (diff)
parentf7e66d49fc4e374071d60109337f47d2d102b53a (diff)
downloadnextcloud-server-04db96adaf9faff80aaf26c181215d9986c97263.tar.gz
nextcloud-server-04db96adaf9faff80aaf26c181215d9986c97263.zip
Merge pull request #19006 from owncloud/individual-it-patch-1
allow ".." in folder names
Diffstat (limited to 'apps')
-rw-r--r--apps/files/ajax/upload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 4bc2ce8bdf3..7ff02d8db8e 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -148,7 +148,7 @@ if ($maxUploadFileSize >= 0 and $totalSize > $maxUploadFileSize) {
}
$result = array();
-if (strpos($dir, '..') === false) {
+if (\OC\Files\Filesystem::isValidPath($dir) === true) {
$fileCount = count($files['name']);
for ($i = 0; $i < $fileCount; $i++) {