diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 16:26:54 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 16:26:54 +0200 |
| commit | bc11e648af9dc4206c14121bdd73c7a4fc0cc327 (patch) | |
| tree | 8ea1ecc53e2952e0b6bb3c62be07d4a1defa4961 | |
| parent | 669618b5a008f157a0974bb5600a180057688884 (diff) | |
| parent | a49a3091f9de5c8f872b976e22d243db1d0fb1ad (diff) | |
| download | forums-bc11e648af9dc4206c14121bdd73c7a4fc0cc327.tar forums-bc11e648af9dc4206c14121bdd73c7a4fc0cc327.tar.gz forums-bc11e648af9dc4206c14121bdd73c7a4fc0cc327.tar.bz2 forums-bc11e648af9dc4206c14121bdd73c7a4fc0cc327.tar.xz forums-bc11e648af9dc4206c14121bdd73c7a4fc0cc327.zip | |
Merge pull request #3978 from RMcGirr83/ticket_13851
[ticket/13851] Fix ignore flood limit check
* RMcGirr83/ticket_13851:
[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 2bd3a1a1d2..5fcd427b2b 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1027,7 +1027,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; |