Loading Dockerfile +1 −2 Original line number Diff line number Diff line Loading @@ -82,8 +82,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PAT RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.patch # RUN patch -u ${BASE_DIR}/apps/files_trashbin/lib/Storage.php -i ${TMP_PATCH_DIR}/007-files-trashbin-parent-wrapper.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/008-remove-dev-notice.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/007-remove-dev-notice.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion Loading patches/007-files-trashbin-parent-wrapper.patchdeleted 100644 → 0 +0 −19 Original line number Diff line number Diff line From: Akhil <akhil@e.email> Date: Tue, 29 Jun 2021 14:10:00 +0530 Subject: [PATCH] Use parent wrapper to properly handle moves on the same source/target storage This patch adds changes described at https://github.com/nextcloud/server/pull/27016/files for NC 20.0.10 Resolves encryption issues when deleting files after upgrade to NC 20.0.10 diff --git ./apps/files_trashbin/lib/Storage.php ./apps/files_trashbin/lib/Storage-new.php --- ./apps/files_trashbin/lib/Storage.php 2021-06-29 14:03:36.547345625 +0530 +++ ./apps/files_trashbin/lib/Storage-new.php 2021-06-29 14:06:32.135969869 +0530 @@ -237,7 +237,7 @@ /** @var Storage $sourceStorage */ $sourceStorage->disableTrash(); } - $result = $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); + $result = parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); if ($sourceIsTrashbin) { /** @var Storage $sourceStorage */ $sourceStorage->enableTrash(); patches/008-remove-dev-notice.patch→patches/007-remove-dev-notice.patch +0 −0 File moved. View file Loading
Dockerfile +1 −2 Original line number Diff line number Diff line Loading @@ -82,8 +82,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PAT RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.patch # RUN patch -u ${BASE_DIR}/apps/files_trashbin/lib/Storage.php -i ${TMP_PATCH_DIR}/007-files-trashbin-parent-wrapper.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/008-remove-dev-notice.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/007-remove-dev-notice.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion Loading
patches/007-files-trashbin-parent-wrapper.patchdeleted 100644 → 0 +0 −19 Original line number Diff line number Diff line From: Akhil <akhil@e.email> Date: Tue, 29 Jun 2021 14:10:00 +0530 Subject: [PATCH] Use parent wrapper to properly handle moves on the same source/target storage This patch adds changes described at https://github.com/nextcloud/server/pull/27016/files for NC 20.0.10 Resolves encryption issues when deleting files after upgrade to NC 20.0.10 diff --git ./apps/files_trashbin/lib/Storage.php ./apps/files_trashbin/lib/Storage-new.php --- ./apps/files_trashbin/lib/Storage.php 2021-06-29 14:03:36.547345625 +0530 +++ ./apps/files_trashbin/lib/Storage-new.php 2021-06-29 14:06:32.135969869 +0530 @@ -237,7 +237,7 @@ /** @var Storage $sourceStorage */ $sourceStorage->disableTrash(); } - $result = $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); + $result = parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); if ($sourceIsTrashbin) { /** @var Storage $sourceStorage */ $sourceStorage->enableTrash();