Merge branch '2.1.x'

tests/functional/portal_acp_test.php

@@ -90,7 +90,7 @@ class phpbb_functional_portal_acp_test extends \board3\portal\tests\testframewor
 
 	public function test_portal_permissions()
 	{
-		$this->add_lang_ext('board3/portal', 'info_acp_portal');
+		$this->add_lang_ext('board3/portal', 'permissions_portal');
 		$crawler = self::request('GET', 'adm/index.php?i=acp_permissions&mode=setting_group_global&sid=' . $this->sid);
 		$form = $crawler->selectButton('submit')->form();
 		$crawler = self::submit($form);

tests/unit/event/listener_test.php

@@ -127,6 +127,7 @@ class listener_test extends \phpbb_template_template_test_case
 			'core.user_setup',
 			'core.viewonline_overwrite_location',
 			'core.page_header',
+			'core.permissions',
 		), array_keys(\board3\portal\event\listener::getSubscribedEvents()));
 	}