Merge remote-tracking branch 'upstream/release/v1.15' into release/dc…

…s/v1.15
unfoldingWord · Oct 28, 2021 · b49d525 · b49d525
2 parents 61ae226 + 6110ddc
commit b49d525
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
@@ -197,7 +197,7 @@
 					{{svg "octicon-person"}} {{.i18n.Tr "register"}}
 				</a>
 			{{end}}
-			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{.CurrentURL}}">
+			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login{{if not .PageIsSignIn}}?redirect_to={{.CurrentURL}}{{end}}">
 				{{svg "octicon-sign-in"}} {{.i18n.Tr "sign_in"}}
 			</a>
 		</div><!-- end anonymous right menu -->