diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-03 16:48:58 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-03 16:48:58 +0000 |
| commit | a0c9705bb7d3e203324d777782a6915bf5eee1d1 (patch) | |
| tree | 49ef27393e12cc6e18720b86083424ab730ef175 | |
| parent | bb5c5adab106ea2fe9a414a62fbb99d63cbc5c1d (diff) | |
| download | forums-a0c9705bb7d3e203324d777782a6915bf5eee1d1.tar forums-a0c9705bb7d3e203324d777782a6915bf5eee1d1.tar.gz forums-a0c9705bb7d3e203324d777782a6915bf5eee1d1.tar.bz2 forums-a0c9705bb7d3e203324d777782a6915bf5eee1d1.tar.xz forums-a0c9705bb7d3e203324d777782a6915bf5eee1d1.zip | |
every second commit an pre/post-commit error... :/
Ask for forum password if post within passworded forum quoted in private message (Reported by nickvergessen)
git-svn-id: file:///svn/phpbb/trunk@9169 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 2a8243b73a..9a540ad22c 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -251,6 +251,25 @@ function compose_pm($id, $mode, $action) { trigger_error('NOT_AUTHORISED'); } + + // Passworded forum? + if ($post['forum_id']) + { + $sql = 'SELECT forum_password + FROM ' . FORUMS_TABLE . ' + WHERE forum_id = ' . (int) $post['forum_id']; + $result = $db->sql_query($sql); + $forum_password = (string) $db->sql_fetchfield('forum_password'); + $db->sql_freeresult($result); + + if ($forum_password) + { + login_forum_box(array( + 'forum_id' => $post['forum_id'], + 'forum_password' => $forum_password, + )); + } + } } $msg_id = (int) $post['msg_id']; |