diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2020-01-04 14:21:58 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-04 21:51:44 +0100 |
| commit | 1b8193ab8b2c73d4a38520c206816817db168447 (patch) | |
| tree | 7f0842d90b52cb926d15cc1df1dde77a2972d586 /phpBB/includes/ucp/ucp_pm_viewfolder.php | |
| parent | b83de54bb4fd3217b41f61de896e73732752d196 (diff) | |
| parent | ed9cbc89c19bc6321bfdd540f241683b71ea9a6e (diff) | |
| download | forums-1b8193ab8b2c73d4a38520c206816817db168447.tar forums-1b8193ab8b2c73d4a38520c206816817db168447.tar.gz forums-1b8193ab8b2c73d4a38520c206816817db168447.tar.bz2 forums-1b8193ab8b2c73d4a38520c206816817db168447.tar.xz forums-1b8193ab8b2c73d4a38520c206816817db168447.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewfolder.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index 09e7bf4d7c..ce40a2507d 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -32,6 +32,8 @@ function view_folder($id, $mode, $folder_id, $folder) $folder_info = get_pm_from($folder_id, $folder, $user->data['user_id']); + add_form_key('ucp_pm_view_folder'); + if (!$submit_export) { $user->add_lang('viewforum'); @@ -197,6 +199,11 @@ function view_folder($id, $mode, $folder_id, $folder) $enclosure = $request->variable('enclosure', ''); $delimiter = $request->variable('delimiter', ''); + if (!check_form_key('ucp_pm_view_folder')) + { + trigger_error('FORM_INVALID'); + } + if ($export_type == 'CSV' && ($delimiter === '' || $enclosure === '')) { $template->assign_var('PROMPT', true); |