From c0beff333259a3d249840162daa09590581ea1f5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 22 Feb 2024 19:14:36 +0530 Subject: [PATCH] revese patch --- Dockerfile | 2 +- patches/004-contact-search-controller-removal.patch | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 60d36c1a..c2c1c287 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="6.1.5" ARG DROP_ACCOUNT_VERSION="2.3.2" -RUN sed -i 's/26,0,8,2/26,0,8,24/' ${BASE_DIR}/version.php +RUN sed -i 's/26,0,8,2/26,0,8,25/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images diff --git a/patches/004-contact-search-controller-removal.patch b/patches/004-contact-search-controller-removal.patch index 5c6d7d2e..e9b8a360 100644 --- a/patches/004-contact-search-controller-removal.patch +++ b/patches/004-contact-search-controller-removal.patch @@ -15,16 +15,3 @@ diff --git ContactsMenuController.php ContactsMenuController-new.php + return []; } - /** -@@ -59,11 +59,6 @@ - * @throws Exception - */ - public function findOne(int $shareType, string $shareWith) { -- $contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith); -- -- if ($contact) { -- return $contact; -- } - return new JSONResponse([], Http::STATUS_NOT_FOUND); - } - } -- GitLab