diff --git a/Dockerfile b/Dockerfile index 22d713b98a7444bb2f46e132928a59af1cfbed43..f04bcdb7bb98a83ebee595e158f1e4bd1eebe994 100644 --- a/Dockerfile +++ b/Dockerfile @@ -88,7 +88,6 @@ RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.pa RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/007-remove-dev-notice.patch RUN patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR}/008-icons-cacher-theme-svgs.patch RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/008-svg-controller-theme-svgs.patch -RUN patch -u ${BASE_DIR}/lib/private/TemplateLayout.php -i ${TMP_PATCH_DIR}/009-remove-external-sites-from-navigation.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/009-remove-external-sites-from-navigation.patch b/patches/009-remove-external-sites-from-navigation.patch deleted file mode 100644 index 6b359727ca8a2d294af3f97e7fd67973577ce855..0000000000000000000000000000000000000000 --- a/patches/009-remove-external-sites-from-navigation.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Akhil -Date: Tue, 28 Jul 2021 21:25:00 +0530 -Subject: [PATCH] Removes external results from navigation - -This patch removes external link results from navigation. External link results are those coming from the -"external sites" app - -diff --git ./lib/private/TemplateLayout.php ./lib/private/TemplateLayout-new.php ---- ./lib/private/TemplateLayout.php 2021-07-29 00:10:10.515495166 +0530 -+++ ./lib/private/TemplateLayout-new.php 2021-07-29 00:10:27.873160383 +0530 -@@ -105,7 +105,12 @@ - $this->assign('application', ''); - $this->assign('appid', $appId); - -- $navigation = $this->navigationManager->getAll(); -+ $navigation = $this->navigationManager->getAll(); -+ $navigation = array_filter($navigation, function($entry) { -+ if (strpos($entry["id"], "external_index") !== 0) { -+ return true; -+ } -+ }); - $this->assign('navigation', $navigation); - $settingsNavigation = $this->navigationManager->getAll('settings'); - $this->assign('settingsnavigation', $settingsNavigation);