diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-02-20 21:04:52 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-02-20 21:04:52 -0600 |
| commit | 736d11225c8ad52b9b5848b1b1bd26b328fcc643 (patch) | |
| tree | fbd8b34ba091337d430e393ef05819892f743919 /phpBB | |
| parent | 4f6b9080e8c997eac0644ede70a19b99914102ee (diff) | |
| parent | 0a418739a36bdd41932d3ca18c4edcfa6cf44a01 (diff) | |
| download | forums-736d11225c8ad52b9b5848b1b1bd26b328fcc643.tar forums-736d11225c8ad52b9b5848b1b1bd26b328fcc643.tar.gz forums-736d11225c8ad52b9b5848b1b1bd26b328fcc643.tar.bz2 forums-736d11225c8ad52b9b5848b1b1bd26b328fcc643.tar.xz forums-736d11225c8ad52b9b5848b1b1bd26b328fcc643.zip | |
Merge pull request #1939 from prototech/ticket/12078
[ticket/12078] Check for f_delete when a user attempts to permanently delete a post.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/posting.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 902f1b2175..442e1d9782 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -42,7 +42,7 @@ $refresh = (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($ $mode = request_var('mode', ''); // If the user is not allowed to delete the post, we try to soft delete it, so we overwrite the mode here. -if ($mode == 'delete' && (($confirm && !$request->is_set_post('delete_permanent')) || !$auth->acl_get('m_delete', $forum_id))) +if ($mode == 'delete' && (($confirm && !$request->is_set_post('delete_permanent')) || !$auth->acl_gets('f_delete', 'm_delete', $forum_id))) { $mode = 'soft_delete'; } |