Skip to content

[stable32] fix(share): extract expiration from cached data #2106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sorbaugh merged 1 commit into from
Sep 9, 2025
Merged

[stable32] fix(share): extract expiration from cached data #2106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(share): extract expiration from cached data 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @backportbot
ArtificialOwl authored and backportbot[bot] committed Sep 4, 2025
commit 6003322ef50dd2e1f790593940fbf7ec2993ac60
9 changes: 5 additions & 4 deletions lib/Model/ShareWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,9 +512,9 @@ public function import(array $data): IDeserializable {
$this->importAttributesFromDatabase($this->get('attributes', $data));

try {
$expirationDate = $this->get('expiration', $data);
if ($expirationDate !== '') {
$this->setExpirationDate(new DateTime($expirationDate));
$expirationDate = $this->getInt('expiration', $data);
if ($expirationDate > 0) {
$this->setExpirationDate((new DateTime())->setTimestamp($expirationDate));
}
} catch (\Exception $e) {
}
Expand Down Expand Up @@ -578,7 +578,7 @@ public function importFromDatabase(array $data, string $prefix = ''): IQueryRow
->setShareNote($this->get($prefix . 'note', $data));

try {
$expirationDate = $this->get('expiration', $data);
$expirationDate = $this->get($prefix . 'expiration', $data);
if ($expirationDate !== '') {
$this->setExpirationDate(new DateTime($expirationDate));
}
Expand Down Expand Up @@ -643,6 +643,7 @@ public function jsonSerialize(): array {
'itemTarget' => $this->getItemTarget(),
'fileSource' => $this->getFileSource(),
'fileTarget' => $this->getFileTarget(),
'expiration' => $this->getExpirationDate()?->getTimestamp(),
'status' => $this->getStatus(),
'shareTime' => $this->getShareTime()->getTimestamp(),
'note' => $this->getShareNote(),
Expand Down
Loading