From f8099708da3e931c45be033c5f63be20140e59cb Mon Sep 17 00:00:00 2001 From: Lorenzo Nicoletti Date: Fri, 3 Aug 2018 16:03:04 +0200 Subject: [PATCH 1/2] fix - the filename fallback must only contain ASCII characters --- src/MembersBundle/Controller/RequestController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MembersBundle/Controller/RequestController.php b/src/MembersBundle/Controller/RequestController.php index f3211e4b..91c47bd9 100644 --- a/src/MembersBundle/Controller/RequestController.php +++ b/src/MembersBundle/Controller/RequestController.php @@ -77,7 +77,7 @@ private function serveFile(Model\Asset $asset) $response->headers->set('Content-Length', $asset->getFileSize('noformatting')); $response->headers->set('Content-Disposition', $response->headers->makeDisposition( $forceDownload ? ResponseHeaderBag::DISPOSITION_ATTACHMENT : ResponseHeaderBag::DISPOSITION_INLINE, - basename($asset->getFileName()) + \Pimcore\File::getValidFilename(basename($asset->getFileName())) )); if ($forceDownload === false) { From d7f54b10f7bae373802310fd6321ce60f1588e83 Mon Sep 17 00:00:00 2001 From: Lorenzo Nicoletti Date: Fri, 11 Jan 2019 16:18:48 +0100 Subject: [PATCH 2/2] #81 fix for compatibility with pimcore 5.6.0 --- .../CoreExtension/GroupMultiselect.php | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/MembersBundle/CoreExtension/GroupMultiselect.php b/src/MembersBundle/CoreExtension/GroupMultiselect.php index 4db5557a..51611203 100644 --- a/src/MembersBundle/CoreExtension/GroupMultiselect.php +++ b/src/MembersBundle/CoreExtension/GroupMultiselect.php @@ -178,4 +178,26 @@ public function getDataFromResource($data = [], $object = null, $params = []) return $elements; } -} \ No newline at end of file + /** + * @param array $data + * @param null $object + * @param array $params + * @return array + */ + public function loadData($data, $object = null, $params = []) + { + return $this->getDataFromResource($data, $object, $params); + } + + /** + * @param array $data + * @param null $object + * @param array $params + * @return array + */ + public function prepareDataForPersistence($data, $object = null, $params = []) + { + return $this->getDataFromResource($data, $object, $params); + } + +}