Merge pull request #2104 from nickvergessen/ticket/12261

[ticket/12261] Remove web root path from login redirect url

1 files changed, 15 insertions, 1 deletions

diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index 45246f8a97..47d856a5df 100644
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -10,13 +10,15 @@ class controller
 	protected $helper;
 	protected $path_helper;
 	protected $config;
+	protected $user;
 
-	public function __construct(\phpbb\controller\helper $helper, \phpbb\path_helper $path_helper, \phpbb\template\template $template, \phpbb\config\config $config, $root_path, $php_ext)
+	public function __construct(\phpbb\controller\helper $helper, \phpbb\path_helper $path_helper, \phpbb\template\template $template, \phpbb\config\config $config, \phpbb\user $user, $root_path, $php_ext)
 	{
 		$this->template = $template;
 		$this->helper = $helper;
 		$this->path_helper = $path_helper;
 		$this->config = $config;
+		$this->user = $user;
 		$this->root_path = $root_path;
 		$this->php_ext = $php_ext;
 	}
@@ -43,6 +45,18 @@ class controller
 		throw new \phpbb\controller\exception('Exception thrown from foo/exception route');
 	}
 
+	public function login_redirect()
+	{
+		if (!$this->user->data['is_registered'])
+		{
+			login_box();
+		}
+
+		$this->template->assign_var('A_VARIABLE', 'I am a variable');
+
+		return $this->helper->render('foo_bar_body.html');
+	}
+
 	public function redirect()
 	{
 		$url_root = generate_board_url();