Merge branch '2.1.x'

2015-09-14 13:13:55 +02:00
parent 2e947cd66f b93ebc781e
commit 2799ba6762
21 changed files with 263 additions and 39 deletions
--- a/tests/unit/event/listener_test.php
+++ b/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()));
 	}