aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-05-06 22:11:33 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-05-06 22:11:33 +0200
commita97d9d4b899c424530e53d813c71eee192262e40 (patch)
treefa692d5bba3e49c60607b6a578aba5cd92649687 /phpBB/posting.php
parent01eded7cc2b206cce593a389f09259c25e5107ff (diff)
parent841f1e492204b67443f9595e2ecdb571e74aabe9 (diff)
downloadforums-a97d9d4b899c424530e53d813c71eee192262e40.tar
forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.gz
forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.bz2
forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.xz
forums-a97d9d4b899c424530e53d813c71eee192262e40.zip
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
Diffstat (limited to 'phpBB/posting.php')
-rw-r--r--phpBB/posting.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index d32f7e33d9..c6b9ff4cce 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -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'])
);
}