diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 16:27:02 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 16:27:02 +0200 |
| commit | 1e36c6d16cd6a412e894075cea4170565b49ee8a (patch) | |
| tree | bb6f3b3dd6a3b8a83b9b2711726f1ce4db080689 | |
| parent | e94f9d7830819c2391a10914ab3cffaebf72836e (diff) | |
| parent | bc11e648af9dc4206c14121bdd73c7a4fc0cc327 (diff) | |
| download | forums-1e36c6d16cd6a412e894075cea4170565b49ee8a.tar forums-1e36c6d16cd6a412e894075cea4170565b49ee8a.tar.gz forums-1e36c6d16cd6a412e894075cea4170565b49ee8a.tar.bz2 forums-1e36c6d16cd6a412e894075cea4170565b49ee8a.tar.xz forums-1e36c6d16cd6a412e894075cea4170565b49ee8a.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13851] Fix ignore flood limit check
| -rw-r--r-- | phpBB/posting.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index af146aa31e..3174626f6b 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1030,7 +1030,8 @@ if ($submit || $preview || $refresh) $message_parser->bbcode_bitfield = $post_data['bbcode_bitfield']; } - if ($mode != 'edit' && !$preview && !$refresh && $config['flood_interval'] && !$auth->acl_get('f_ignoreflood', $forum_id)) + $ignore_flood = $auth->acl_get('u_ignoreflood') ? true : $auth->acl_get('f_ignoreflood', $forum_id); + if ($mode != 'edit' && !$preview && !$refresh && $config['flood_interval'] && !$ignore_flood) { // Flood check $last_post_time = 0; |