From cbdff06aa95a7987b54c712dc6729e138f608eca Mon Sep 17 00:00:00 2001 From: Henare Degan Date: Sun, 3 Mar 2013 14:52:30 +1100 Subject: Rename Configuration class to avoid conflict with ActiveSupport::Configurable --- app/helpers/link_to_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/helpers/link_to_helper.rb') 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 -- cgit v1.2.3