From 7e0d54a331ccb569dafeae8b051db5a34e177b5f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 27 Feb 2015 22:58:51 +0100 Subject: [PATCH] [ticket/13647] Use the Symfony way for redirecting PHPBB3-13647 --- phpBB/faq.php | 8 ++++++-- phpBB/phpbb/help/controller/help.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/phpBB/faq.php b/phpBB/faq.php index 5d8a97bc26..7420bc5a95 100644 --- a/phpBB/faq.php +++ b/phpBB/faq.php @@ -27,5 +27,9 @@ $user->setup(); /** @var \phpbb\controller\helper $controller_helper */ $controller_helper = $phpbb_container->get('controller.helper'); -send_status_line(301, 'Moved Permanently'); -redirect($controller_helper->route('phpbb_help_controller', array('mode' => $request->variable('mode', 'faq')))); +$response = new \Symfony\Component\HttpFoundation\RedirectResponse( + $controller_helper->route('phpbb_help_controller', array( + 'mode' => $request->variable('mode', 'faq'), + ), 301) +); +$response->send(); diff --git a/phpBB/phpbb/help/controller/help.php b/phpBB/phpbb/help/controller/help.php index e9594a0563..9cc3b0c8b4 100644 --- a/phpBB/phpbb/help/controller/help.php +++ b/phpBB/phpbb/help/controller/help.php @@ -97,7 +97,7 @@ class help if ($ext_name === '' || $lang_file === '') { - throw new http_exception(501, 'FEATURE_NOT_AVAILABLE'); + throw new http_exception(404, 'Not Found'); } $this->user->add_lang($lang_file, false, true, $ext_name);