diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-08-03 12:34:07 +0200 |
|---|---|---|
| committer | Patrick Webster <noxwizard@phpbb.com> | 2012-08-03 05:56:49 -0500 |
| commit | ae612de663dbcd76074df4ea950a3a94745ca0ec (patch) | |
| tree | 2a3268494f1778c1bc585ea1f8b67a14efb7796b /phpBB/includes/template/template.php | |
| parent | 10f8c738b60d3acd42e002c334eee8f8d8dd74d5 (diff) | |
| download | forums-ae612de663dbcd76074df4ea950a3a94745ca0ec.tar forums-ae612de663dbcd76074df4ea950a3a94745ca0ec.tar.gz forums-ae612de663dbcd76074df4ea950a3a94745ca0ec.tar.bz2 forums-ae612de663dbcd76074df4ea950a3a94745ca0ec.tar.xz forums-ae612de663dbcd76074df4ea950a3a94745ca0ec.zip | |
[ticket/11043] Allow call_hook() to be called from more than one location.
Allow the helper function call_hook() of class phpbb_template to be called
from more than once location and thus for more than one hook (although there is
only one) by adding the method name as a parameter.
PHPBB3-11043
Diffstat (limited to 'phpBB/includes/template/template.php')
| -rw-r--r-- | phpBB/includes/template/template.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index 13fa845659..b7c3e00dee 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -139,7 +139,7 @@ class phpbb_template */ public function display($handle) { - $result = $this->call_hook($handle); + $result = $this->call_hook($handle, __FUNCTION__); if ($result !== false) { return $result[0]; @@ -174,16 +174,17 @@ class phpbb_template * Calls hook if any is defined. * * @param string $handle Template handle being displayed. + * @param string $method Method name of the caller. */ - private function call_hook($handle) + private function call_hook($handle, $method) { global $phpbb_hook; - if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $handle, $this)) + if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, $method), $handle, $this)) { - if ($phpbb_hook->hook_return(array(__CLASS__, __FUNCTION__))) + if ($phpbb_hook->hook_return(array(__CLASS__, $method))) { - $result = $phpbb_hook->hook_return_result(array(__CLASS__, __FUNCTION__)); + $result = $phpbb_hook->hook_return_result(array(__CLASS__, $method)); return array($result); } } |