diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-08-18 01:09:33 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-08-18 01:09:33 +0530 |
| commit | c54f1faf59731149d6f0ac87ce813fb3d11f743b (patch) | |
| tree | ae1dfa6e43a2c3f4a61f855ed026c5f4d9ac1431 /phpBB | |
| parent | 772494af7ecd3bc85edc0af109a565da67543608 (diff) | |
| parent | 65d8cd63022d688fe618f128768b78a6214db166 (diff) | |
| download | forums-c54f1faf59731149d6f0ac87ce813fb3d11f743b.tar forums-c54f1faf59731149d6f0ac87ce813fb3d11f743b.tar.gz forums-c54f1faf59731149d6f0ac87ce813fb3d11f743b.tar.bz2 forums-c54f1faf59731149d6f0ac87ce813fb3d11f743b.tar.xz forums-c54f1faf59731149d6f0ac87ce813fb3d11f743b.zip | |
Merge remote-tracking branch 'VSEphpbb/ticket/11784' into develop
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/11784:
[ticket/11784] Remove naming redundancy for event listeners
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/event/extension_subscriber_loader.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/node/event.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/event/extension_subscriber_loader.php b/phpBB/phpbb/event/extension_subscriber_loader.php index d933b943d7..d6284a52fb 100644 --- a/phpBB/phpbb/event/extension_subscriber_loader.php +++ b/phpBB/phpbb/event/extension_subscriber_loader.php @@ -33,7 +33,6 @@ class phpbb_event_extension_subscriber_loader $finder = $this->extension_manager->get_finder(); $subscriber_classes = $finder ->extension_directory('/event') - ->suffix('listener') ->core_path('event/') ->get_classes(); diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php index 4533151d05..c94e5fdf20 100644 --- a/phpBB/phpbb/template/twig/node/event.php +++ b/phpBB/phpbb/template/twig/node/event.php @@ -43,7 +43,7 @@ class phpbb_template_twig_node_event extends Twig_Node { $compiler->addDebugInfo($this); - $location = $this->listener_directory . $this->getNode('expr')->getAttribute('name') . '_listener'; + $location = $this->listener_directory . $this->getNode('expr')->getAttribute('name'); foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path) { |