diff options
author | Vincent Petry <pvince81@owncloud.com> | 2016-05-24 13:49:02 +0200 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-24 13:49:02 +0200 |
commit | 465cf9fe9b8fb8c448cb42d4c811b2ecd215d4f1 (patch) | |
tree | 83b68a95fb5a3eeb36eb6e00f9b99e6db979c91d /apps/files_sharing/lib | |
parent | 4ffc936624d7a26271862a794fd472b1678de644 (diff) | |
parent | df59c5d1ee5810293e3c7a6a63f00f0e94126c03 (diff) | |
download | nextcloud-server-465cf9fe9b8fb8c448cb42d4c811b2ecd215d4f1.tar.gz nextcloud-server-465cf9fe9b8fb8c448cb42d4c811b2ecd215d4f1.zip |
Merge pull request #24346 from lenz1111/fix_24331
Fix: Bugs in shared link with video #24331
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r-- | apps/files_sharing/lib/controllers/sharecontroller.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php index 8662765d196..04912d20afc 100644 --- a/apps/files_sharing/lib/controllers/sharecontroller.php +++ b/apps/files_sharing/lib/controllers/sharecontroller.php @@ -347,6 +347,8 @@ class ShareController extends Controller { $shareTmpl['downloadURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.downloadShare', array('token' => $token)); $shareTmpl['maxSizeAnimateGif'] = $this->config->getSystemValue('max_filesize_animated_gifs_public_sharing', 10); $shareTmpl['previewEnabled'] = $this->config->getSystemValue('enable_previews', true); + $shareTmpl['previewMaxX'] = $this->config->getSystemValue('preview_max_x', 1024); + $shareTmpl['previewMaxY'] = $this->config->getSystemValue('preview_max_y', 1024); $csp = new OCP\AppFramework\Http\ContentSecurityPolicy(); $csp->addAllowedFrameDomain('\'self\''); |