diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-12-15 02:21:26 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-12-15 02:21:26 +0100 |
| commit | 946d58eaa8f93eb612a277fad1d7f870554b578e (patch) | |
| tree | 18ad2ac0c504eb283d70c040ce449b259d88f97f /apps/files_sharing | |
| parent | 7969d6e64617235744889df42d0e671085a779a8 (diff) | |
| parent | 6ff38624a717316d7992c81db6d4dbf8f5d86f3a (diff) | |
| download | nextcloud-server-946d58eaa8f93eb612a277fad1d7f870554b578e.tar.gz nextcloud-server-946d58eaa8f93eb612a277fad1d7f870554b578e.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/js/share.js | 4 | ||||
| -rw-r--r-- | apps/files_sharing/public.php | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 7eb086712f4..8a546d62163 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -33,6 +33,4 @@ $(document).ready(function() { }); OC.Share.loadIcons('file'); } - - -});
\ No newline at end of file +}); diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 7bfbd1dd399..eb4af58cdca 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -175,7 +175,7 @@ if ($linkItem) { if (isset($_GET['path'])) { $path .= $_GET['path']; } - if (!$path || !OC_Filesystem::isValidPath($path) || !OC_Filesystem::file_exists($path)) { + if (!$path || !\OC\Files\Filesystem::isValidPath($path) || !OC_Filesystem::file_exists($path)) { OCP\Util::writeLog('share', 'Invalid path ' . $path . ' for share id ' . $linkItem['id'], \OCP\Util::ERROR); header('HTTP/1.0 404 Not Found'); $tmpl = new OCP\Template('', '404', 'guest'); |