mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 20:45:29 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Noxwizard/ticket/11043' into develop

Browse Source 
* Noxwizard/ticket/11043:
  [ticket/11043] Change hook name back to display, since that's where we hook in.
  [ticket/11043] Allow call_hook() to be called from more than one location.
  [ticket/11043] Update template hook name
This commit is contained in:
Andreas Fischer 2012-08-07 22:27:30 +02:00
commit bb40b558f1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/common.php
View File

@ -132,7 +132,7 @@ $phpbb_subscriber_loader->load();
// Add own hook handler
require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display')));
foreach ($cache->obtain_hooks() as $hook)
{

11
phpBB/includes/template/template.php
View File

@ -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);
}
}