# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1309174689 -3600
# Node ID 9867ed78c4c1ebfdf39a6cea3b5623adc66d9b52
# Parent  ec7c78040115659c0fc40ee1664eb54e0c476ea7# Parent  32dd9e02950ab0febd2bfa2ceb0d528a5aa90817
Merge

diff -r ec7c78040115 -r 9867ed78c4c1 app/controllers/application_controller.rb
--- 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)