From e7351414c26b903e938fed67c2ede56f250734a9 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 5 Jun 2018 16:43:33 +0100
Subject: Remove unneeded base in main navigation.

This can cause issues with e.g. multi-language sites, and was
only needed for cases where the admin was proxied, which we do
not suggest any more.
---
 CHANGELOG.md                     | 1 +
 templates/web/base/main_nav.html | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9681fbb8c..8e9a7f0d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * Unreleased
     - Bugfixes:
         - Fix pointer event issue selecting pin on map. #2130
+        - Fix admin navigation links in multi-language installs.
 
 * v2.3.2 (31st May 2018)
     - Front end improvements:
diff --git a/templates/web/base/main_nav.html b/templates/web/base/main_nav.html
index 9736697e3..189630902 100644
--- a/templates/web/base/main_nav.html
+++ b/templates/web/base/main_nav.html
@@ -1,7 +1,4 @@
 [%
-    SET base = "";
-    SET base = c.cobrand.base_url IF admin;
-
     # DEFAULT would make sense here, except it treats the empty string as falsy
     # and some cobrands want to set ul_class to an empty string.
     SET ul_class="nav-menu nav-menu--main" UNLESS ul_class.defined;
@@ -11,7 +8,7 @@
       [%~ IF c.req.uri.path == uri AND NOT always_url ~%]
           <span [% attrs %]>[% label %]</span>
       [%~ ELSE ~%]
-          <a href="[% base %][% uri %][% suffix IF suffix %]" [% attrs %]>[% label %]</a>
+          <a href="[% uri %][% suffix IF suffix %]" [% attrs %]>[% label %]</a>
       [%~ END ~%]
     </li>
 [%~ END %]
-- 
cgit v1.2.3