diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-04 12:37:53 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-04 12:37:53 +0100 |
| commit | 33cf36a3dfafe64bd721e0627e2a99b56a94238c (patch) | |
| tree | ad203ab96bdaa537ec44b6874b359aad4adcdc08 /app | |
| parent | b6231086aa895c83bfeb1cc7067725a9b96e8d0d (diff) | |
| parent | 772af44350723936778abe45e888b2fac36da726 (diff) | |
Merge remote-tracking branch 'henare_github/full-url-in-admin-emails' into develop
Diffstat (limited to 'app')
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index c8ad7bc30..e4e52427b 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -222,8 +222,7 @@ module LinkToHelper # Admin pages def admin_url(relative_path) 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 + (admin_url_prefix.empty? ? admin_general_index_url + '/' : admin_url_prefix) + relative_path end # About page URLs |