diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-24 01:24:45 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-24 01:24:45 -0400 |
| commit | 10d963a94e6be18c988d38bba7c235e260b6c8a5 (patch) | |
| tree | ed36ae9f08fb621a8c3b1da1a66a1e5e63750252 /phpBB/includes/functions_posting.php | |
| parent | 5bf8ac475bee6cbfcbbe12bf86a6ce5a65640886 (diff) | |
| parent | 41becd9c92672b2d77777b8487df5dbb66851342 (diff) | |
| download | forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar.gz forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar.bz2 forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar.xz forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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'; |