[mb-commits] r10385 - mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller

[root at musicbrainz.org]

Author: acid2
Date: 2008-09-26 16:04:25 +0000 (Fri, 26 Sep 2008)
New Revision: 10385

Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm
Log:
Login redirection changes

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm	2008-09-26 13:50:07 UTC (rev 10384)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm	2008-09-26 16:04:25 UTC (rev 10385)
@@ -63,7 +63,14 @@
             if( $c->authenticate({ username => $username,
                                    password => $password }) )
             {
-                $c->response->redirect($c->req->referer);
+                my $dest = $c->req->referer;
+                my $uri = $c->uri_for('/user/login');
+
+                if ($dest =~ /$uri/) {
+                    $dest = $c->session->{_user_login_old_redir};
+                }
+
+                $c->response->redirect($dest);
                 $c->detach;
             }
             else
@@ -72,6 +79,7 @@
             }
         }
 
+        $c->session->{_user_login_old_redir} = $c->req->referer;
         $c->stash->{template} = 'user/login.tt';
 
         # Have to make sure we detach