Merge branch 'ticket/jellydoughnut/9679' into develop-olympus

* ticket/jellydoughnut/9679:
  [ticket/9679] phpBB offers to notify poster even if notification is disabled
This commit is contained in:
Andreas Fischer 2010-07-31 02:07:25 +02:00
commit 4d61788843

View file

@ -691,6 +691,8 @@ function approve_post($post_id_list, $id, $mode)
{ {
$show_notify = false; $show_notify = false;
if ($config['email_enable'] || $config['jab_enable'])
{
foreach ($post_info as $post_data) foreach ($post_info as $post_data)
{ {
if ($post_data['poster_id'] == ANONYMOUS) if ($post_data['poster_id'] == ANONYMOUS)
@ -703,6 +705,7 @@ function approve_post($post_id_list, $id, $mode)
break; break;
} }
} }
}
$template->assign_vars(array( $template->assign_vars(array(
'S_NOTIFY_POSTER' => $show_notify, 'S_NOTIFY_POSTER' => $show_notify,