mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable Conflicts: phpBB/download/file.php phpBB/styles/prosilver/template/login_forum.html
This commit is contained in:
@@ -1,5 +1,13 @@
|
||||
<!-- INCLUDE overall_header.html -->
|
||||
|
||||
<!-- IF FORUM_NAME -->
|
||||
<div id="pageheader">
|
||||
<h2><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
|
||||
</div>
|
||||
|
||||
<br clear="all" /><br />
|
||||
<!-- ENDIF -->
|
||||
|
||||
<div id="pagecontent">
|
||||
|
||||
<form name="login_forum" method="post" action="{S_LOGIN_ACTION}">
|
||||
|
Reference in New Issue
Block a user