diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-14 12:55:03 -0400 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-14 12:55:03 -0400 |
| commit | e4a5ce307d49c215b08e35a79147ba2418f133ff (patch) | |
| tree | 993d416d2d2acdc7c90ad50fff90bf6e412e5022 | |
| parent | 9c72bbe284514c1aa70f8ac65e9dfcafb72d36dd (diff) | |
| download | forums-e4a5ce307d49c215b08e35a79147ba2418f133ff.tar forums-e4a5ce307d49c215b08e35a79147ba2418f133ff.tar.gz forums-e4a5ce307d49c215b08e35a79147ba2418f133ff.tar.bz2 forums-e4a5ce307d49c215b08e35a79147ba2418f133ff.tar.xz forums-e4a5ce307d49c215b08e35a79147ba2418f133ff.zip | |
[ticket/11582] Test the event and and fix it.
PHPBB3-11582
4 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index 66360424ea..0fbacdad8a 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -66,7 +66,7 @@ class phpbb_permissions * @since 3.1-A1 */ $vars = array('types', 'categories', 'permissions'); - extract($phpbb_dispatcher->trigger_event('core.permissions', $vars)); + extract($phpbb_dispatcher->trigger_event('core.permissions', compact($vars))); $this->categories = $categories; $this->types = $types; diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php index 6c1720735c..badbdbb057 100644 --- a/tests/functional/extension_permission_lang_test.php +++ b/tests/functional/extension_permission_lang_test.php @@ -75,6 +75,6 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t $this->assertContains('Can attach files', $crawler->filter('body')->text()); // language from ext/foo/bar/language/en/permissions_foo.php - $this->assertContains('Can view foo', $crawler->filter('body')->text()); + $this->assertContains('Can view foobar', $crawler->filter('body')->text()); } } diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php b/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php index dfabf7c540..39cb9f8b46 100644 --- a/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php +++ b/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php @@ -34,7 +34,7 @@ class phpbb_ext_foo_bar_event_permission_listener implements EventSubscriberInte public function add_permissions($event) { $permissions = $event['permissions']; - $permissions['u_foo'] = array('lang' => 'ACL_U_FOO', 'cat' => 'misc'), + $permissions['u_foo'] = array('lang' => 'ACL_U_FOOBAR', 'cat' => 'post'), $event['permissions'] = $permissions; } } diff --git a/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php b/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php index 36c84c5209..64b497c394 100644 --- a/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php +++ b/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php @@ -1,5 +1,5 @@ <?php $lang = array_merge($lang, array( - 'ACL_U_FOO' => 'Can view foo', + 'ACL_U_FOOBAR' => 'Can view foobar with permission foo', )); |