aboutsummaryrefslogtreecommitdiffstats
path: root/app/helpers/link_to_helper.rb
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2012-09-25 08:55:35 +1000
committerMatthew Landauer <matthew@openaustralia.org>2012-09-25 08:55:35 +1000
commitf59700138f7360436767fddea554c739e2cd484b (patch)
tree8c3af52f3f1f369ab412fa7571f19860e4f260b8 /app/helpers/link_to_helper.rb
parent265e336ae0608af39aa3aad8b27862e572222562 (diff)
Extract configuration with defaults into one module
Diffstat (limited to 'app/helpers/link_to_helper.rb')
-rwxr-xr-xapp/helpers/link_to_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index cae17ebd3..c8ad7bc30 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -221,7 +221,7 @@ module LinkToHelper
# Admin pages
def admin_url(relative_path)
- admin_url_prefix = MySociety::Config.get("ADMIN_BASE_URL", "")
+ admin_url_prefix = Configuration::admin_base_url
admin_url_prefix = admin_general_index_path+"/" if admin_url_prefix.empty?
return admin_url_prefix + relative_path
end
@@ -241,7 +241,7 @@ module LinkToHelper
def main_url(relative_path, append = nil)
- url_prefix = "http://" + MySociety::Config.get("DOMAIN", '127.0.0.1:3000')
+ url_prefix = "http://" + Configuration::domain
url = url_prefix + relative_path
if !append.nil?
begin