diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-23 23:25:59 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-23 23:25:59 +0200 |
| commit | f20e3e9febbce2c871cb3810c9b03388c3751a99 (patch) | |
| tree | ae4058b805c2b486ddc5b23d93bd68632a5c6642 | |
| parent | cdd36f32434d9432c0c3b0174723a81eb8894a55 (diff) | |
| parent | 34aad4046fa5e15522b12e069862327de2aa0f36 (diff) | |
| download | forums-f20e3e9febbce2c871cb3810c9b03388c3751a99.tar forums-f20e3e9febbce2c871cb3810c9b03388c3751a99.tar.gz forums-f20e3e9febbce2c871cb3810c9b03388c3751a99.tar.bz2 forums-f20e3e9febbce2c871cb3810c9b03388c3751a99.tar.xz forums-f20e3e9febbce2c871cb3810c9b03388c3751a99.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13070] Use old 'template' class for template class hook
| -rw-r--r-- | phpBB/phpbb/template/base.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/template/base.php b/phpBB/phpbb/template/base.php index ab0e1f281d..9a40702ba8 100644 --- a/phpBB/phpbb/template/base.php +++ b/phpBB/phpbb/template/base.php @@ -142,11 +142,11 @@ abstract class base implements template { global $phpbb_hook; - if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, $method), $handle, $this)) + if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array('template', $method), $handle, $this)) { - if ($phpbb_hook->hook_return(array(__CLASS__, $method))) + if ($phpbb_hook->hook_return(array('template', $method))) { - $result = $phpbb_hook->hook_return_result(array(__CLASS__, $method)); + $result = $phpbb_hook->hook_return_result(array('template', $method)); return array($result); } } |