diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-14 23:03:27 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-14 23:03:27 +0100 |
| commit | 9fac95c2ab46a734607657bbad6f164aaa61286f (patch) | |
| tree | fc035f83bc812fd4b2f36427bb130ddabf71433e /core/ajax/preview.php | |
| parent | b330d07b51a983dc563a91244a3c83e691c9e97d (diff) | |
| parent | df282d9ef8e040833574fac5c5fd3cbbae1b3209 (diff) | |
| download | nextcloud-server-9fac95c2ab46a734607657bbad6f164aaa61286f.tar.gz nextcloud-server-9fac95c2ab46a734607657bbad6f164aaa61286f.zip | |
Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
lib/private/appconfig.php
Diffstat (limited to 'core/ajax/preview.php')
| -rw-r--r-- | core/ajax/preview.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/ajax/preview.php b/core/ajax/preview.php index af0f0493f4c..a1267d6f5cf 100644 --- a/core/ajax/preview.php +++ b/core/ajax/preview.php @@ -7,7 +7,7 @@ */ \OC_Util::checkLoggedIn(); -$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; +$file = array_key_exists('file', $_GET) ? (string) $_GET['file'] : ''; $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36'; $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36'; $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; |