summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-10-20 20:00:34 +0200
committerLukas Reschke <lukas@owncloud.com>2014-10-20 20:00:34 +0200
commitf451ecb8d848636f37d8c80f1f12ab3c695c136f (patch)
treef21987462243b56389805d5c6a87c4b14df5f05d
parentc0ddf06dfe5056598ed08c34da46bde0f8cab34c (diff)
downloadnextcloud-server-f451ecb8d848636f37d8c80f1f12ab3c695c136f.tar.gz
nextcloud-server-f451ecb8d848636f37d8c80f1f12ab3c695c136f.zip
URLEncode filenames to be compatible with special characters
-rw-r--r--apps/files/controller/apicontroller.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/controller/apicontroller.php b/apps/files/controller/apicontroller.php
index 01f9086c27d..89d24a5c47f 100644
--- a/apps/files/controller/apicontroller.php
+++ b/apps/files/controller/apicontroller.php
@@ -32,7 +32,7 @@ class ApiController extends Controller {
*
* @param int $x
* @param int $y
- * @param string $file
+ * @param string $file URL-encoded filename
* @return JSONResponse|DownloadResponse
*/
public function getThumbnail($x, $y, $file) {
@@ -41,9 +41,9 @@ class ApiController extends Controller {
}
try {
- $preview = new Preview('', 'files', $file, $x, $y, true);
+ $preview = new Preview('', 'files', urldecode($file), $x, $y, true);
echo($preview->showPreview('image/png'));
- return new DownloadResponse($file.'.png', 'image/png');
+ return new DownloadResponse(urldecode($file).'.png', 'image/png');
} catch (\Exception $e) {
return new JSONResponse('File not found.', Http::STATUS_NOT_FOUND);
}