diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-14 11:40:21 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-14 11:40:21 -0800 |
| commit | 2bb4c266a6a3d2febe119054675f7d5ee8a9f46f (patch) | |
| tree | 383f811eee1dcdf78ebc10fe853796fe91f34766 /apps | |
| parent | 447e468d1ad5fbfe447d4b7446d6babba6802bbf (diff) | |
| parent | d9ab964ff980d495c8960a728fb082f006b6a1e6 (diff) | |
| download | nextcloud-server-2bb4c266a6a3d2febe119054675f7d5ee8a9f46f.tar.gz nextcloud-server-2bb4c266a6a3d2febe119054675f7d5ee8a9f46f.zip | |
Merge pull request #5862 from owncloud/files-singledotdirs
Files singledotdirs
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/ajax/list.php | 2 | ||||
| -rw-r--r-- | apps/files/index.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 350fc7fa5f6..0be38c3b96f 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -10,7 +10,7 @@ OCP\JSON::checkLoggedIn(); // Load the files $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; - +$dir = \OC\Files\Filesystem::normalizePath($dir); if (!\OC\Files\Filesystem::is_dir($dir . '/')) { header("HTTP/1.0 404 Not Found"); exit(); diff --git a/apps/files/index.php b/apps/files/index.php index f0f95b3bac8..9ae378d7a1d 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -36,6 +36,7 @@ OCP\Util::addscript('files', 'filelist'); OCP\App::setActiveNavigationEntry('files_index'); // Load the files $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; +$dir = \OC\Files\Filesystem::normalizePath($dir); // Redirect if directory does not exist if (!\OC\Files\Filesystem::is_dir($dir . '/')) { header('Location: ' . OCP\Util::getScriptName() . ''); @@ -128,7 +129,7 @@ if ($needUpgrade) { $tmpl = new OCP\Template('files', 'index', 'user'); $tmpl->assign('fileList', $list->fetchPage()); $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage()); - $tmpl->assign('dir', \OC\Files\Filesystem::normalizePath($dir)); + $tmpl->assign('dir', $dir); $tmpl->assign('isCreatable', $isCreatable); $tmpl->assign('permissions', $permissions); $tmpl->assign('files', $files); |