From fffb07fd91b42d64e71e16a13bcdde87114fad19 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 11 Apr 2014 18:09:25 +0200 Subject: [ticket/10073] Use namespaces and fix all class names PHPBB3-10073 --- phpBB/memberlist.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'phpBB/memberlist.php') diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index fab9747cce..2e480a472e 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -755,20 +755,21 @@ switch ($mode) if ($user_id) { - $form = new phpbb_message_user_form($phpbb_root_path, $phpEx, $user, $auth, $config, $db); + $form_name = 'user'; } else if ($topic_id) { - $form = new phpbb_message_topic_form($phpbb_root_path, $phpEx, $user, $auth, $config, $db); + $form_name = 'topic'; } else if ($mode === 'contactadmin') { - $form = new phpbb_message_admin_form($phpbb_root_path, $phpEx, $user, $auth, $config, $db); + $form_name = 'admin'; } else { trigger_error('NO_EMAIL'); } + $form = $phpbb_container->get('message.form.' . $form_name); $form->bind($request); $error = $form->check_allow(); @@ -777,7 +778,7 @@ switch ($mode) trigger_error($error); } - if (isset($_POST['submit'])) + if ($request->is_set_post('submit')) { $messenger = new messenger(false); $form->submit($messenger); -- cgit v1.2.1