diff options
| author | Henare Degan <henare.degan@gmail.com> | 2013-03-03 14:52:30 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2013-03-03 14:52:30 +1100 |
| commit | cbdff06aa95a7987b54c712dc6729e138f608eca (patch) | |
| tree | b101dd575c5cab97675c0ac488e68fa6cbd0c4fd /app/helpers/link_to_helper.rb | |
| parent | f02881b5bf5cc4d633983100078be2e64b8e6fcc (diff) | |
Rename Configuration class to avoid conflict with ActiveSupport::Configurable
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 030fab20b..74de5eb6d 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -219,7 +219,7 @@ module LinkToHelper # Admin pages def admin_url(relative_path) - admin_url_prefix = Configuration::admin_base_url + admin_url_prefix = AlaveteliConfiguration::admin_base_url (admin_url_prefix.empty? ? admin_general_index_url + '/' : admin_url_prefix) + relative_path end @@ -238,7 +238,7 @@ module LinkToHelper def main_url(relative_path, append = nil) - url_prefix = "http://" + Configuration::domain + url_prefix = "http://" + AlaveteliConfiguration::domain url = url_prefix + relative_path if !append.nil? begin |