-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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.
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
[stable9] Fix cross-storage move info when moving between two received shares #28284
Conversation
Oh no... the fileid changes after move 😢
|
Added backport of b53d659. Strangely the part from "apps/files_sharing/lib/cache.php" was completely missing. |
👍 |
96ecfab
to
099d6f9
Compare
rebased ⛏ |
ran out of rebases for today 😢 |
Need to properly resolve the given path to a source path in `getMoveInfo`. This was missing when adding this new method.
The CacheWrapper will properly forward the call to the wrapped cache.
099d6f9
to
0086803
Compare
rebase ammo for stable9 reloaded: rebased 🔨 |
uh oh
I did run the integration tests before pushing... |
hmm, 0086803 was supposed to fix this:
I clearly remember seeing it passing. But it was before I did the cherry pick. In my first attempt I didn't use that commit but simply picked the function out of another diff... hmm... |
Now I get it... in my first attempt I took the code directly from stable9.1, which is https://github.com/owncloud/core/blob/stable9.1/lib/private/Files/Cache/Wrapper/CacheJail.php#L311. Then to be clean I looked at git blame to find the commit that added this there. Now if you look closely 0086803#diff-ae33233c15f58849fc5659b9b0157798R309 you can see that it's not 100% the same... On stable9.1 there's an additional Going to cherry pick that one now... |
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Backport of #28238 to stable9 which is based on #28022 and #27172.
This prevents the inconsistency to happen when moving between two received shares or moving something out of a received share. (tested manually)
@jvillafanez @tomneedham