From b9a5887897dd82be9e22fed7e00eeb022c016516 Mon Sep 17 00:00:00 2001 From: Devlin Junker Date: Mon, 7 Aug 2023 12:00:35 -0700 Subject: resolve build issues Signed-off-by: Devlin Junker --- lib/Controller/PageController.php | 1 - lib/Service/FolderServiceV2.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 41d0e7f89..abdd3f2f7 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -96,7 +96,6 @@ class PageController extends Controller $csp->addAllowedImageDomain('*') ->addAllowedMediaDomain('*') ->addAllowedConnectDomain('*')// chrome breaks on audio elements - ->allowEvalScript(true) ->addAllowedFrameDomain('https://youtube.com') ->addAllowedFrameDomain('https://www.youtube.com') ->addAllowedFrameDomain('https://player.vimeo.com') diff --git a/lib/Service/FolderServiceV2.php b/lib/Service/FolderServiceV2.php index 1e710a37b..e70e4dee9 100644 --- a/lib/Service/FolderServiceV2.php +++ b/lib/Service/FolderServiceV2.php @@ -155,7 +155,7 @@ class FolderServiceV2 extends Service public function markDelete(string $userId, int $folderId, bool $mark): Entity { $folder = $this->find($userId, $folderId); - $time = $mark ? $this->timeFactory->getTime() : 0; + $time = $mark ? $this->timeFactory->now()->getTimestamp() : 0; $folder->setDeletedAt($time); return $this->mapper->update($folder); -- cgit v1.2.3