aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-08-28 23:25:30 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-08-28 23:25:30 +0200
commitdbe8fb6488005c3295f839c7302a56f1de872426 (patch)
tree1b4192f1c0fc1e38a6571377969dd2a2f0d7f2ef
parent098ff476023609fa0e53fba132d6bbda6ceee3bd (diff)
parentc71236ff4d55605ce037c2f0c8b8fb3791f86ee0 (diff)
downloadforums-dbe8fb6488005c3295f839c7302a56f1de872426.tar
forums-dbe8fb6488005c3295f839c7302a56f1de872426.tar.gz
forums-dbe8fb6488005c3295f839c7302a56f1de872426.tar.bz2
forums-dbe8fb6488005c3295f839c7302a56f1de872426.tar.xz
forums-dbe8fb6488005c3295f839c7302a56f1de872426.zip
Merge branch 'ticket/rxu/9117' into develop-olympus
* ticket/rxu/9117: [ticket/9117] Wrong redirection after login.
-rw-r--r--phpBB/styles/prosilver/template/login_body.html2
-rw-r--r--phpBB/styles/subsilver2/template/login_body.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html
index fe111aaa45..e52ccd6434 100644
--- a/phpBB/styles/prosilver/template/login_body.html
+++ b/phpBB/styles/prosilver/template/login_body.html
@@ -32,11 +32,11 @@
</dl>
<!-- ENDIF -->
+ {S_LOGIN_REDIRECT}
<dl>
<dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
</dl>
- {S_LOGIN_REDIRECT}
</fieldset>
</div>
<span class="corners-bottom"><span></span></span></div>
diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html
index 51f7068b5f..503de9e69e 100644
--- a/phpBB/styles/subsilver2/template/login_body.html
+++ b/phpBB/styles/subsilver2/template/login_body.html
@@ -72,12 +72,12 @@
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
<!-- ENDIF -->
+{S_LOGIN_REDIRECT}
<tr>
<td class="cat" <!-- IF not S_ADMIN_AUTH or S_CONFIRM_CODE -->colspan="2"<!-- ENDIF --> align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="5" /></td>
</tr>
</table>
{S_FORM_TOKEN}
-{S_LOGIN_REDIRECT}
</form>
<br clear="all" />