aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2010-07-29 10:01:35 -0500
committerJosh Woody <a_jelly_doughnut@phpbb.com>2010-07-29 10:01:35 -0500
commit8ea0309ed1e72023cab9daef407005511e99ac14 (patch)
tree09dd3e966fa7407c98feb40db19cf04c9de5f268
parentfc25fe694afdab683789c9ed962c77558f85796c (diff)
downloadforums-8ea0309ed1e72023cab9daef407005511e99ac14.tar
forums-8ea0309ed1e72023cab9daef407005511e99ac14.tar.gz
forums-8ea0309ed1e72023cab9daef407005511e99ac14.tar.bz2
forums-8ea0309ed1e72023cab9daef407005511e99ac14.tar.xz
forums-8ea0309ed1e72023cab9daef407005511e99ac14.zip
[ticket/9679] phpBB offers to notify poster even if notification is disabled
The "notify user" check box would not do anything if checked in this case, but it was still presented. The checkbox is now only shown if there are notification options enabled. PHPBB3-9679
-rw-r--r--phpBB/includes/mcp/mcp_queue.php19
1 files changed, 11 insertions, 8 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index f84a8c5f07..e43881fab2 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -691,16 +691,19 @@ function approve_post($post_id_list, $id, $mode)
{
$show_notify = false;
- foreach ($post_info as $post_data)
+ if ($config['email_enable'] || $config['jab_enable'])
{
- if ($post_data['poster_id'] == ANONYMOUS)
- {
- continue;
- }
- else
+ foreach ($post_info as $post_data)
{
- $show_notify = true;
- break;
+ if ($post_data['poster_id'] == ANONYMOUS)
+ {
+ continue;
+ }
+ else
+ {
+ $show_notify = true;
+ break;
+ }
}
}