mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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:
Andreas Fischer
2013-05-06 22:11:33 +02:00
parent 01eded7cc2 841f1e4922
commit a97d9d4b89
7 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/posting.php
View File

@@ -228,6 +228,7 @@ if ($post_data['forum_password'])
{
login_forum_box(array(
'forum_id' => $forum_id,
'forum_name' => $post_data['forum_name'],
'forum_password' => $post_data['forum_password'])
);
}