we don't need to check permissions twice #284
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
👍 |
| @@ -320,16 +320,10 @@ public static function rollback($file, $revision) { | |||
| // add expected leading slash | |||
| $file = '/' . ltrim($file, '/'); | |||
| list($uid, $filename) = self::getUidAndFilename($file); | |||
| if ($uid === null || trim($filename, '/') === '') { | |||
There was a problem hiding this comment.
I'm pretty sure this is needed to handle some edge cases but I don't remember the details
There was a problem hiding this comment.
I can't think of any, but I will put it back... can't hurt. Also the tests seems not to handle such edge cases
schiessle
force-pushed
the
cleanup-after-sync
branch
from
1400030 to
2cf4530
Compare
|
@icewind1991 I added the additional check again, please review. Thanks! |
Can you backport the additional check also to stable9? |
|
@LukasReschke done: #304 |
|
👍 |
1 similar comment
|
👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
we check the permission already here: https://github.com/nextcloud/server/compare/cleanup-after-sync?expand=1#diff-efc44835a2c59b3707c965b80a3d669eL338
cc @LukasReschke @MorrisJobke