diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-31 02:07:25 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-31 02:07:25 +0200 |
| commit | 4d6178884302167bc2e5868975ba2830fda20dfb (patch) | |
| tree | 3921fa03a55c80aaa873218d95d343d492433f77 /phpBB/includes | |
| parent | d0d912216519b0b5294989afdc7178a7c3e302ae (diff) | |
| parent | 8ea0309ed1e72023cab9daef407005511e99ac14 (diff) | |
| download | forums-4d6178884302167bc2e5868975ba2830fda20dfb.tar forums-4d6178884302167bc2e5868975ba2830fda20dfb.tar.gz forums-4d6178884302167bc2e5868975ba2830fda20dfb.tar.bz2 forums-4d6178884302167bc2e5868975ba2830fda20dfb.tar.xz forums-4d6178884302167bc2e5868975ba2830fda20dfb.zip | |
Merge branch 'ticket/jellydoughnut/9679' into develop-olympus
* ticket/jellydoughnut/9679:
[ticket/9679] phpBB offers to notify poster even if notification is disabled
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 19 |
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; + } } } |