diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-24 01:24:01 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-24 01:24:01 -0400 |
| commit | 41becd9c92672b2d77777b8487df5dbb66851342 (patch) | |
| tree | f02bead73f1a02fb2df6a375d670007da4912484 /phpBB/includes/functions_posting.php | |
| parent | 0b4abd01c89e81c6bbd4674378525664be39cffc (diff) | |
| parent | 952b4de231a87c849d654db18bb9c759fdbcb54d (diff) | |
| download | forums-41becd9c92672b2d77777b8487df5dbb66851342.tar forums-41becd9c92672b2d77777b8487df5dbb66851342.tar.gz forums-41becd9c92672b2d77777b8487df5dbb66851342.tar.bz2 forums-41becd9c92672b2d77777b8487df5dbb66851342.tar.xz forums-41becd9c92672b2d77777b8487df5dbb66851342.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12612' into develop-ascraeus
* github-nickvergessen/ticket/12612:
[ticket/12612] Prefix check_ids() with phpbb_
[ticket/12612] Prefix mcp_sorting() with phpbb_
[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
[ticket/12612] Prefix module url functions with phpbb_
[ticket/12612] Prefix upload_popup() with phpbb_
[ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
[ticket/12612] Prefix custom UCP module function with phpbb_
[ticket/12612] Prefix _sort_last_active() with phpbb_
[ticket/12612] Prefix show_profile() with phpbb and delete unused global
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 23fdd809e2..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; @@ -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'; |