Skip to content

[stable19] Always sort shares in a reliable way #21352

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
rullzer merged 1 commit into from
Jun 11, 2020
Merged

[stable19] Always sort shares in a reliable way #21352

Show file tree
Hide file tree
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
Always sort shares in a reliable way 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot
nickvergessen authored and backportbot[bot] committed Jun 10, 2020
commit c63039bb83e254f0085c34c1ce2fe04c9dd2d84c
8 changes: 5 additions & 3 deletions apps/files_sharing/lib/MountProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,12 @@ private function groupShares(array $shares) {
// sort by stime, the super share will be based on the least recent share
foreach ($tmp as &$tmp2) {
@usort($tmp2, function ($a, $b) {
if ($a->getShareTime() <= $b->getShareTime()) {
return -1;
$aTime = $a->getShareTime()->getTimestamp();
$bTime = $b->getShareTime()->getTimestamp();
if ($aTime === $bTime) {
return $a->getId() < $b->getId() ? -1 : 1;
}
return 1;
return $aTime < $bTime ? -1 : 1;
});
$result[] = $tmp2;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Share/IShare.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ public function getNodeCacheEntry();
* This is mainly for public shares. It will signal that the share page should
* hide download buttons etc.
*
* @param bool $ro
* @param bool $hide
* @return IShare
* @since 15.0.0
*/
Expand Down