diff options
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/config_helper.rb | 4 | ||||
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/mailer_helper.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/config_helper.rb b/app/helpers/config_helper.rb index 73e12172f..026600ff1 100644 --- a/app/helpers/config_helper.rb +++ b/app/helpers/config_helper.rb @@ -1,5 +1,5 @@ module ConfigHelper def site_name - Configuration::site_name + AlaveteliConfiguration::site_name end -end
\ No newline at end of file +end 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 diff --git a/app/helpers/mailer_helper.rb b/app/helpers/mailer_helper.rb index be2ce47aa..3d4bbac71 100644 --- a/app/helpers/mailer_helper.rb +++ b/app/helpers/mailer_helper.rb @@ -1,5 +1,5 @@ module MailerHelper def contact_from_name_and_email - "#{Configuration::contact_name} <#{Configuration::contact_email}>" + "#{AlaveteliConfiguration::contact_name} <#{AlaveteliConfiguration::contact_email}>" end end |