From 9551bfbc5236aed8af8ed3fe6d6f4631d630bfbc Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Mon, 5 May 2003 22:48:17 +0000 Subject: email topic, minor other changes, removed updating of parent forums upon posting (handled by functions_display) git-svn-id: file:///svn/phpbb/trunk@3980 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/viewtopic.php') diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 008ae24feb..1b28758072 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -453,7 +453,7 @@ $template->assign_vars(array( 'U_VIEW_OLDER_TOPIC' => $view_prev_topic_url, 'U_VIEW_NEWER_TOPIC' => $view_next_topic_url, 'U_PRINT_TOPIC' => "viewtopic.$phpEx$SID&f=$forum_id&t=$topic_id&$u_sort_param&view=print", - 'U_EMAIL_TOPIC' => "viewtopic.$phpEx$SID&f=$forum_id&t=$topic_id&view=email", + 'U_EMAIL_TOPIC' => "memberlist.$phpEx$SID&mode=email&t=$topic_id", 'U_POST_NEW_TOPIC' => $new_topic_url, 'U_POST_REPLY_TOPIC' => $reply_topic_url) @@ -802,9 +802,9 @@ do } } - if (!empty($row['user_viewemail']) || $auth->acl_gets('m_', 'a_', $forum_id)) + if ((!empty($row['user_viewemail']) || $auth->acl_get('m_', $forum_id)) && $config['email_enable']) { - $email_url = ($config['board_email_form'] && $config['email_enable']) ? "ucp.$phpEx$SID&mode=email&u=" . $poster_id : 'mailto:' . $row['user_email']; + $email_url = ($config['board_email_form']) ? "memberlist.$phpEx$SID&mode=email&u=" . $poster_id : 'mailto:' . $row['user_email']; $user_cache[$poster_id]['email_img'] = '' . $user->img('btn_email', $user->lang['SEND_EMAIL']) . ''; $user_cache[$poster_id]['email'] = '' . $user->lang['SEND_EMAIL'] . ''; } -- cgit v1.2.1