# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1309174682 -3600
# Node ID 32dd9e02950ab0febd2bfa2ceb0d528a5aa90817
# Parent  350acce374a205d36064457c25ff617f89406bd3# Parent  dff13616e4645747023fbdfaab134030be60fbe7
Merge

diff -r 350acce374a2 -r 32dd9e02950a app/controllers/application_controller.rb
--- 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)