aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Houston <robin@lenny.robin>2011-07-14 04:48:15 +0100
committerRobin Houston <robin@lenny.robin>2011-07-14 04:48:15 +0100
commite5d6a6f2a91f9e268f19fbc533628fd0bdc252cb (patch)
tree97d9c06c3ad26727c53fc99076e4c4a9931548c5
parent1e309c29fb2d61fbdf27ad546ad4ae9c008a2f0c (diff)
parent018f650a59d259c843bc0d2cf159984059578b57 (diff)
Merge branch 'master' into wdtk
-rwxr-xr-xapp/helpers/link_to_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 935912a61..6d8ae345e 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -162,7 +162,7 @@ module LinkToHelper
# Admin pages
def admin_url(relative_path)
- admin_url_prefix = admin_general_index_path+"/"
+ admin_url_prefix = MySociety::Config.get("ADMIN_BASE_URL", admin_general_index_path+"/")
return admin_url_prefix + relative_path
end