Skip to content

Commit

Permalink
Merge branch '2024.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
gitlabci committed Jan 30, 2025
2 parents ea0bbd6 + cd7a594 commit 6f5ddfe
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions tine20/Tinebase/WebDav/Container/Abstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -562,11 +562,13 @@ public function supportsSyncToken()
*/
public function getSyncToken()
{
// this only returns null if the container is not found or if container.content_seq = NULL, this does not look up the content history!
if (null === ($token = Tinebase_Container::getInstance()->getContentSequence($this->_container))) {
return '-1';
if ($this->_container instanceof Tinebase_Model_Container) {
// this only returns null if the container is not found or if container.content_seq = NULL, this does not look up the content history!
return Tinebase_Container::getInstance()->getContentSequence($this->_container) ?? '-1';
} else {
// TreeNode
return $this->_container->seq;
}
return $token;
}

/**
Expand Down

0 comments on commit 6f5ddfe

Please sign in to comment.