diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 21:56:20 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 21:56:20 +0200 |
| commit | 841f1e492204b67443f9595e2ecdb571e74aabe9 (patch) | |
| tree | 86d6eed8f5f27aaf933a5bd5357c7463fdf4338e /phpBB/includes | |
| parent | 92e0613324ac1ddff9c303aaed58eeecb0dfe6b2 (diff) | |
| parent | eefcdfa54a80e4f62c88b6758b2e1d22740d1ddd (diff) | |
| download | forums-841f1e492204b67443f9595e2ecdb571e74aabe9.tar forums-841f1e492204b67443f9595e2ecdb571e74aabe9.tar.gz forums-841f1e492204b67443f9595e2ecdb571e74aabe9.tar.bz2 forums-841f1e492204b67443f9595e2ecdb571e74aabe9.tar.xz forums-841f1e492204b67443f9595e2ecdb571e74aabe9.zip | |
Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympus
* MGaetan89/ticket/11144:
[ticket/11144] Add missing {FORUM_NAME} variable
[ticket/11144] Add missing {FORUM_NAME} variable
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ccd2d3147c..98a1dab722 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3272,6 +3272,7 @@ function login_forum_box($forum_data) page_header($user->lang['LOGIN'], false); $template->assign_vars(array( + 'FORUM_NAME' => isset($forum_data['forum_name']) ? $forum_data['forum_name'] : '', 'S_LOGIN_ACTION' => build_url(array('f')), 'S_HIDDEN_FIELDS' => build_hidden_fields(array('f' => $forum_data['forum_id']))) ); diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 8e82188aff..d7509a1072 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -271,19 +271,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); } } } |