diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-07-30 17:22:20 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-07-30 17:22:20 +0200 |
| commit | 62b37fbb997c0244d37953b05e333cdb2279a31a (patch) | |
| tree | f51b0d3613ed361a65770a27b4284ac235268e30 /apps | |
| parent | ef3c0c508fc18fc0888097f920883cda7c5e1370 (diff) | |
| parent | c066320208da5211abe7e244bd2b045009367518 (diff) | |
| download | nextcloud-server-62b37fbb997c0244d37953b05e333cdb2279a31a.tar.gz nextcloud-server-62b37fbb997c0244d37953b05e333cdb2279a31a.zip | |
Merge pull request #10024 from owncloud/preview-restrict-height
Also keep maxY into account when scaling a preview while preserving aspect ratio
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/ajax/publicpreview.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/apps/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php index 0b2af7a6e59..f5343a7ef26 100644 --- a/apps/files_sharing/ajax/publicpreview.php +++ b/apps/files_sharing/ajax/publicpreview.php @@ -70,10 +70,6 @@ if(substr($path, 0, 1) === '/') { $path = substr($path, 1); } -if ($keepAspect === true) { - $maxY = $maxX; -} - if($maxX === 0 || $maxY === 0) { \OC_Response::setStatus(\OC_Response::STATUS_BAD_REQUEST); \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); |