From 5403b487885dd7593a43c198f8baacc194ff1a3a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 23 Jun 2014 22:48:08 +0200 Subject: [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global PHPBB3-12612 --- phpBB/includes/functions_posting.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/functions_posting.php') 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'; -- cgit v1.2.1 From e4437e19e8be79c32945fbb4e79df84e60e73690 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 23 Jun 2014 22:49:00 +0200 Subject: [ticket/12612] Prefix upload_popup() with phpbb_ PHPBB3-12612 --- phpBB/includes/functions_posting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions_posting.php') diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index e21b8d4e8c..0b37af0ee0 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -2489,7 +2489,7 @@ function phpbb_bump_topic($forum_id, $topic_id, $post_data, $bump_time = false) /** * Show upload popup (progress bar) */ -function upload_popup($forum_style = 0) +function phpbb_upload_popup($forum_style = 0) { global $template, $user; -- cgit v1.2.1