diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-01 11:03:52 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-01 11:03:52 +0100 |
| commit | be96333dafd0fa0623ca4495237c8c6fa5457c14 (patch) | |
| tree | 6a0dbc34767db4a49ea9231738fe17dd1df6934a /app/helpers/link_to_helper.rb | |
| parent | 3cfa6c4d1c4ae6ba5e3f22ff8757d1ec9dcd8b68 (diff) | |
| parent | 6ee1e8d0a4a8cfe02797c1a853bf27af2610ad27 (diff) | |
Merge remote-tracking branch 'openaustralia_github/configuration_refactor' into develop
Conflicts:
config/general.yml-example
Diffstat (limited to 'app/helpers/link_to_helper.rb')
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 4 |
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 |