changeset 475:32dd9e02950a cannam

Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Mon, 27 Jun 2011 12:38:02 +0100
parents 350acce374a2 (current diff) dff13616e464 (diff)
children 9867ed78c4c1 ef125e1f3a10 4c0d58c5d1e0
files app/controllers/application_controller.rb
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/app/controllers/application_controller.rb	Mon Jun 06 14:55:38 2011 +0100
+++ b/app/controllers/application_controller.rb	Mon Jun 27 12:38:02 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)