Mercurial > hg > soundsoftware-site
changeset 476:9867ed78c4c1 cannam_integration
Merge
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Mon, 27 Jun 2011 12:38:09 +0100 |
| parents | ec7c78040115 (current diff) 32dd9e02950a (diff) |
| children | 3ab94ed89c2f |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/application_controller.rb Mon Jun 27 12:28:32 2011 +0100 +++ b/app/controllers/application_controller.rb Mon Jun 27 12:38:09 2011 +0100 @@ -270,7 +270,11 @@ # soundsoftware: if back_url is the home page, # change it to My Page (#125) if (uri.path == home_path) - uri.path = uri.path + "/my" + if (uri.path =~ /\/$/) + uri.path = uri.path + "my" + else + uri.path = uri.path + "/my" + end end # soundsoftware: if login page is https but back_url http, # switch back_url to https to ensure cookie validity (#83)