diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-23 22:48:08 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-23 22:48:08 +0200 |
| commit | 5403b487885dd7593a43c198f8baacc194ff1a3a (patch) | |
| tree | daae955a3f9543f59cbc5ec0fa00ff0fc671d351 /phpBB | |
| parent | 0abc1f0f973e916f12b0c5cf0e844c991f63c552 (diff) | |
| download | forums-5403b487885dd7593a43c198f8baacc194ff1a3a.tar forums-5403b487885dd7593a43c198f8baacc194ff1a3a.tar.gz forums-5403b487885dd7593a43c198f8baacc194ff1a3a.tar.bz2 forums-5403b487885dd7593a43c198f8baacc194ff1a3a.tar.xz forums-5403b487885dd7593a43c198f8baacc194ff1a3a.zip | |
[ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
PHPBB3-12612
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 | ||||
| -rw-r--r-- | phpBB/posting.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 23fdd809e2..e21b8d4e8c 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -2514,9 +2514,9 @@ function upload_popup($forum_style = 0) /** * Do the various checks required for removing posts as well as removing it */ -function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $is_soft = false, $soft_delete_reason = '') +function phpbb_handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $is_soft = false, $soft_delete_reason = '') { - global $user, $db, $auth, $config, $request; + global $user, $auth, $config, $request; global $phpbb_root_path, $phpEx; $perm_check = ($is_soft) ? 'softdelete' : 'delete'; diff --git a/phpBB/posting.php b/phpBB/posting.php index 1b8fa6debf..dedd393858 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -439,7 +439,7 @@ if ($mode == 'delete' || $mode == 'soft_delete') $allow_reason = $auth->acl_get('m_softdelete', $forum_id) || ($auth->acl_gets('m_delete', 'f_delete', $forum_id) && $auth->acl_gets('m_softdelete', 'f_softdelete', $forum_id)); $soft_delete_reason = ($mode == 'soft_delete' && $allow_reason) ? $request->variable('delete_reason', '', true) : ''; - handle_post_delete($forum_id, $topic_id, $post_id, $post_data, ($mode == 'soft_delete'), $soft_delete_reason); + phpbb_handle_post_delete($forum_id, $topic_id, $post_id, $post_data, ($mode == 'soft_delete'), $soft_delete_reason); return; } @@ -1259,7 +1259,7 @@ if ($submit || $preview || $refresh) { $allow_reason = $auth->acl_get('m_softdelete', $forum_id) || ($auth->acl_gets('m_delete', 'f_delete', $forum_id) && $auth->acl_gets('m_softdelete', 'f_softdelete', $forum_id)); $soft_delete_reason = (!$request->is_set_post('delete_permanent') && $allow_reason) ? $request->variable('delete_reason', '', true) : ''; - handle_post_delete($forum_id, $topic_id, $post_id, $post_data, !$request->is_set_post('delete_permanent'), $soft_delete_reason); + phpbb_handle_post_delete($forum_id, $topic_id, $post_id, $post_data, !$request->is_set_post('delete_permanent'), $soft_delete_reason); return; } |