diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-20 15:47:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-08-01 10:18:49 +0200 |
| commit | 3a9b7c9acf7ab0e9bd78cf76d59c30c48fb17c6a (patch) | |
| tree | c25a0b8278be09865f2e42c2f7145ae04f91a510 /phpBB/includes | |
| parent | 8637f09b356f2b26a33e9ab2a7d245fb0e016f85 (diff) | |
| download | forums-3a9b7c9acf7ab0e9bd78cf76d59c30c48fb17c6a.tar forums-3a9b7c9acf7ab0e9bd78cf76d59c30c48fb17c6a.tar.gz forums-3a9b7c9acf7ab0e9bd78cf76d59c30c48fb17c6a.tar.bz2 forums-3a9b7c9acf7ab0e9bd78cf76d59c30c48fb17c6a.tar.xz forums-3a9b7c9acf7ab0e9bd78cf76d59c30c48fb17c6a.zip | |
[feature/php-events] Remove duplicated event and name the events properly
PHPBB3-9550
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 85449a8cd3..442b125657 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4757,7 +4757,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 $page_header_override = false; $vars = array('page_title', 'display_online_list', 'item_id', 'item', 'page_header_override'); - extract($phpbb_dispatcher->trigger_event('core.page_header_override', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.page_header', compact($vars))); if ($page_header_override) { @@ -5044,9 +5044,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'A_COOKIE_SETTINGS' => addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')), )); - $vars = array('page_title', 'display_online_list', 'item_id', 'item'); - extract($phpbb_dispatcher->trigger_event('core.page_header', compact($vars))); - // application/xhtml+xml not used because of IE header('Content-type: text/html; charset=UTF-8'); @@ -5076,7 +5073,7 @@ function page_footer($run_cron = true) $page_footer_override = false; $vars = array('run_cron', 'page_footer_override'); - extract($phpbb_dispatcher->trigger_event('core.page_footer_override', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.page_footer', compact($vars))); if ($page_footer_override) { |