diff options
| author | Devlin Junker <devlin.junker@gmail.com> | 2023-08-07 12:00:35 -0700 |
|---|---|---|
| committer | Benjamin Brahmer <info@b-brahmer.de> | 2023-08-09 11:08:04 +0200 |
| commit | b9a5887897dd82be9e22fed7e00eeb022c016516 (patch) | |
| tree | 5a43fadfd24355ccd1555dd1460fa96574ca5b1b /lib | |
| parent | eeb06381c95ca28050aecc7bcb4729353f05419a (diff) | |
resolve build issues
Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Controller/PageController.php | 1 | ||||
| -rw-r--r-- | lib/Service/FolderServiceV2.php | 2 |
2 files changed, 1 insertions, 2 deletions
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); |