Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88231aed authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'remove-external-patch' into 'master'

Removes external sites patch(unnecessary)

See merge request !36
parents 3171fee0 8eb52a0e
Loading
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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
+0 −24
Original line number Diff line number Diff line
From: Akhil <akhil@e.email>
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);