diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-06 17:11:47 -0800 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-06 17:11:47 -0800 |
| commit | fc770ee6eb342d4562b6588612f1c9aca46f58e1 (patch) | |
| tree | 8833be60c0f0cb39d33dbaf4538ceca8d848e57f /app/controllers/public_body_controller.rb | |
| parent | 455a1f07f3099d1d94fff2a7efcf99fb8fd6841d (diff) | |
| parent | 7abb45b0549af892b7f1ec2beeca5a42f8c2ef7a (diff) | |
Merge remote-tracking branch 'openaustralia_github/make-links-relative' into develop
Conflicts:
app/controllers/admin_request_controller.rb
app/models/request_mailer.rb
app/views/admin_general/index.rhtml
app/views/admin_general/stats.rhtml
app/views/admin_public_body/_one_list.rhtml
app/views/admin_public_body/_tags.rhtml
app/views/admin_public_body/show.rhtml
app/views/admin_request/show.rhtml
app/views/admin_user/show.rhtml
app/views/layouts/admin.rhtml
app/views/public_body/show.rhtml
app/views/request/new.rhtml
Diffstat (limited to 'app/controllers/public_body_controller.rb')
| -rw-r--r-- | app/controllers/public_body_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 1bcc0145c..aa6980b69 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -31,7 +31,7 @@ class PublicBodyController < ApplicationController set_last_body(@public_body) - top_url = main_url("/") + top_url = frontpage_url @searched_to_send_request = false referrer = request.env['HTTP_REFERER'] if !referrer.nil? && referrer.match(%r{^#{top_url}search/.*/bodies$}) |