diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 22:11:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 22:11:33 +0200 |
| commit | a97d9d4b899c424530e53d813c71eee192262e40 (patch) | |
| tree | fa692d5bba3e49c60607b6a578aba5cd92649687 /phpBB/includes/ucp/ucp_pm_compose.php | |
| parent | 01eded7cc2b206cce593a389f09259c25e5107ff (diff) | |
| parent | 841f1e492204b67443f9595e2ecdb571e74aabe9 (diff) | |
| download | forums-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/includes/ucp/ucp_pm_compose.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index c2d12d17c2..e0e7a46494 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -265,19 +265,16 @@ function compose_pm($id, $mode, $action, $user_folders = array()) // Passworded forum? if ($post['forum_id']) { - $sql = 'SELECT forum_password + $sql = 'SELECT forum_id, forum_name, 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'); + $forum_data = $db->sql_fetchrow($result); $db->sql_freeresult($result); - if ($forum_password) + if (!empty($forum_data['forum_password'])) { - login_forum_box(array( - 'forum_id' => $post['forum_id'], - 'forum_password' => $forum_password, - )); + login_forum_box($forum_data); } } } |