diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-09 12:32:27 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-09 12:32:27 +0100 |
| commit | 8512543cf490e06e3b3ca95d0ae9be3ee8fb850d (patch) | |
| tree | 4fb249012cc5cf7a7d35fe59d5dcae50f7f5751c /phpBB/posting.php | |
| parent | fc110a7332a756891d5f8276d26f88a6e4113350 (diff) | |
| download | forums-8512543cf490e06e3b3ca95d0ae9be3ee8fb850d.tar forums-8512543cf490e06e3b3ca95d0ae9be3ee8fb850d.tar.gz forums-8512543cf490e06e3b3ca95d0ae9be3ee8fb850d.tar.bz2 forums-8512543cf490e06e3b3ca95d0ae9be3ee8fb850d.tar.xz forums-8512543cf490e06e3b3ca95d0ae9be3ee8fb850d.zip | |
[feature/soft-delete] Use request object instead of direct access
PHPBB3-9567
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 62c55d9ff4..0b22fa54c2 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -35,7 +35,7 @@ $submit = (isset($_POST['post'])) ? true : false; $preview = (isset($_POST['preview'])) ? true : false; $save = (isset($_POST['save'])) ? true : false; $load = (isset($_POST['load'])) ? true : false; -$confirm = (isset($_POST['confirm'])) ? true : false; +$confirm = $request->is_set_post('confirm'); $cancel = (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false; $refresh = (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load || $preview); @@ -328,7 +328,7 @@ if ($mode == 'delete' || $mode == 'soft_delete') trigger_error('NO_POST'); } - $soft_delete_reason = ($mode == 'soft_delete' && $auth->acl_get('m_softdelete', $forum_id)) ? utf8_normalize_nfc(request_var('delete_reason', '', true)) : ''; + $soft_delete_reason = ($mode == 'soft_delete' && $auth->acl_get('m_softdelete', $forum_id)) ? $request->variable('delete_reason', '', true) : ''; handle_post_delete($forum_id, $topic_id, $post_id, $post_data, ($mode == 'soft_delete'), $soft_delete_reason); return; } @@ -1119,7 +1119,7 @@ if ($submit || $preview || $refresh) // Handle delete mode... if ($request->is_set_post('delete') || $request->is_set_post('delete_permanent')) { - $soft_delete_reason = (!$request->is_set_post('delete_permanent') && $auth->acl_get('m_softdelete', $forum_id)) ? utf8_normalize_nfc(request_var('delete_reason', '', true)) : ''; + $soft_delete_reason = (!$request->is_set_post('delete_permanent') && $auth->acl_get('m_softdelete', $forum_id)) ? $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); return; } |