Add the ADMIN_BASE_URL variable to general.yml-example, and make the code

treat an empty value the same as if the variable were absent (i.e. to use
the default admin path).

2 files changed, 5 insertions, 1 deletions

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 6d8ae345e..444129052 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -162,7 +162,8 @@ module LinkToHelper
 
     # Admin pages
     def admin_url(relative_path)
-        admin_url_prefix = MySociety::Config.get("ADMIN_BASE_URL", admin_general_index_path+"/")
+        admin_url_prefix = MySociety::Config.get("ADMIN_BASE_URL", "")
+        admin_url_prefix = admin_general_index_path+"/" if admin_url_prefix.empty?
         return admin_url_prefix + relative_path
     end
 
diff --git a/config/general.yml-example b/config/general.yml-example
index 815443094..217668b48 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -48,6 +48,9 @@ BLACKHOLE_PREFIX: 'do-not-reply-to-this-address'
 
 ## Administration
 
+# Delete this one or leave it blank, unless you have some specific reason to change it
+ADMIN_BASE_URL: ''
+
 # Leave these two blank to skip admin authorisation
 ADMIN_USERNAME: 'adminxxxx'
 ADMIN_PASSWORD: 'passwordx'