From 3380c946e12e53368f28a2b7285c7bad0c1746dc Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@kbt.io>
Date: Thu, 11 Aug 2016 19:14:39 +0200
Subject: [PATCH] Always set redirect_to on header-provided sign-in (#3435)

This is an attempt to fix #3089 following the strategy introduced
in d625e41c6c4d40fadbeaf99dd97e77aa0c9085ae, although that strategy
by itself does not seem to be sufficient.

What needs be done is honouring the redirect_url query parameter
from the auth router.
---
 templates/base/head.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index ea7b7cc1d..68ea47894 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -139,7 +139,7 @@
 												<i class="octicon octicon-person"></i> {{.i18n.Tr "register"}}
 											</a>
 										{{end}}
-										<a class="item{{if .PageIsSignIn}} active{{end}}" href="{{AppSubUrl}}/user/login">
+										<a class="item{{if .PageIsSignIn}} active{{end}}" href="{{AppSubUrl}}/user/login?redirect_to={{.Link}}">
 											<i class="octicon octicon-sign-in"></i> {{.i18n.Tr "sign_in"}}
 										</a>
 									</div><!-- end anonymous right menu -->