[stable25] fix: catch ManuallyLockedException and use app context #38044
Conversation
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
backportbot-nextcloud
bot
requested review from
artonge,
juliushaertl and
max-nextcloud
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| $storage1->unlink($internalPath1); | ||
| try { | ||
| // TODO add a proper way of overwriting a file while maintaining file ids | ||
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { |
Check notice
Code scanning / Psalm
ArgumentTypeCoercion
| $storage1->unlink($internalPath1); | ||
| try { | ||
| // TODO add a proper way of overwriting a file while maintaining file ids | ||
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { |
Check notice
Code scanning / Psalm
ArgumentTypeCoercion
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { | ||
| $source = $storage1->fopen($internalPath1, 'r'); | ||
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { | ||
| $source = $storage1->fopen($internalPath1, 'r'); | ||
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument
| $source = $storage1->fopen($internalPath1, 'r'); | ||
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); | ||
| fclose($source); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); | ||
| fclose($source); | ||
| fclose($target); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument
The files_lock app may throw ManuallyLockedExceptions when attempting to revert a file that is currently opened. This would prevent the user from rolling back a opened file. Text and Richdocuments handle changes of the file while editing. Allow reverting files even when they are locked by these apps and let the apps handle the conflict. Signed-off-by: Max <max@nextcloud.com>
max-nextcloud
force-pushed
the
backport/37787/stable25
branch
from
97fbc66
to
7f2de58
Compare
|
/backport to stable24 |
|
The backport to stable24 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable24
git pull origin/stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
backport of #37787