diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-11-23 16:09:09 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-11-23 16:09:09 +0100 |
| commit | 053cf790a93e9cfb521f484901d79c72783f868f (patch) | |
| tree | c10ffc4d0be1b791cc26f4a538aea36614ac55bf /phpBB | |
| parent | f204ce682565c87b041abafa69db76d698b60dfc (diff) | |
| download | forums-053cf790a93e9cfb521f484901d79c72783f868f.tar forums-053cf790a93e9cfb521f484901d79c72783f868f.tar.gz forums-053cf790a93e9cfb521f484901d79c72783f868f.tar.bz2 forums-053cf790a93e9cfb521f484901d79c72783f868f.tar.xz forums-053cf790a93e9cfb521f484901d79c72783f868f.zip | |
[ticket/9924] Pass template instance into $template->display hook
PHPBB3-9924
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/hook_system.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/template.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/docs/hook_system.html b/phpBB/docs/hook_system.html index 1bf4630a9f..34055c4661 100644 --- a/phpBB/docs/hook_system.html +++ b/phpBB/docs/hook_system.html @@ -380,6 +380,8 @@ a:active { color: #368AD2; } <code>$template->display($handle, $include_once = true);</code> which is called directly before outputting the (not-yet-compiled) template.<br /> <code>exit_handler();</code> which is called at the very end of phpBB3's execution.</p> +<p>Please note: The <code>$template->display</code> hook takes a third <code>$template</code> argument, which is the template instance being used, which should be used instead of the global.</p> + <p>There are also valid external constants you may want to use if you embed phpBB3 into your application:</p> <div class="codebox"><pre> diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index f1c8094a9b..6347633b14 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -205,7 +205,7 @@ class template { global $user, $phpbb_hook; - if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $handle, $include_once)) + if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $handle, $include_once, $this)) { if ($phpbb_hook->hook_return(array(__CLASS__, __FUNCTION__))) { |