diff options
| author | Robin Houston <robin.houston@gmail.com> | 2011-07-26 16:00:11 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2011-07-26 16:01:04 +0100 |
| commit | f3a45ede66bd19c029124d94b0844f2eda016c31 (patch) | |
| tree | a5d4282655c242b1abe24dfee9b9fbc2fef5b260 /app/helpers/link_to_helper.rb | |
| parent | 0b253225dc5141a83b76cf7d54f0f1fe475382db (diff) | |
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).
Diffstat (limited to 'app/helpers/link_to_helper.rb')
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 3 |
1 files changed, 2 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 |