diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-26 09:28:12 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-26 09:28:12 +0000 |
| commit | 0a4c62f12e9cfea1215150a580ca76961e1ac7f1 (patch) | |
| tree | 94bc4587549b15523175cb29925b0145e9ab7e98 /phpBB/posting.php | |
| parent | 1cc419fb4cb771e218e2b0c1a65c26b768b1da13 (diff) | |
| download | forums-0a4c62f12e9cfea1215150a580ca76961e1ac7f1.tar forums-0a4c62f12e9cfea1215150a580ca76961e1ac7f1.tar.gz forums-0a4c62f12e9cfea1215150a580ca76961e1ac7f1.tar.bz2 forums-0a4c62f12e9cfea1215150a580ca76961e1ac7f1.tar.xz forums-0a4c62f12e9cfea1215150a580ca76961e1ac7f1.zip | |
Merge in r8924, r8925, r8926, r8936, r8938
git-svn-id: file:///svn/phpbb/trunk@8939 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
| -rw-r--r-- | phpBB/posting.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 34a46a05aa..fc173e7dbd 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1274,7 +1274,7 @@ $template->assign_vars(array( 'S_EDIT_REASON' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false, 'S_DISPLAY_USERNAME' => (!$user->data['is_registered'] || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false, 'S_SHOW_TOPIC_ICONS' => $s_topic_icons, - 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id)) || $auth->acl_get('m_delete', $forum_id))) ? true : false, + 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id))) ? true : false, 'S_BBCODE_ALLOWED' => $bbcode_status, 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', 'S_SMILIES_ALLOWED' => $smilies_status, @@ -1383,10 +1383,10 @@ function upload_popup($forum_style = 0) */ function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data) { - global $user, $db, $auth; + global $user, $db, $auth, $config; // If moderator removing post or user itself removing post, present a confirmation screen - if ($auth->acl_get('m_delete', $forum_id) || ($post_data['poster_id'] == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $post_data['topic_last_post_id'])) + if ($auth->acl_get('m_delete', $forum_id) || ($post_data['poster_id'] == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $post_data['topic_last_post_id'] && !$post_data['post_edit_locked'] && ($post_data['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time']))) { $s_hidden_fields = build_hidden_fields(array( 'p' => $post_id, |