mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
[feature/events] Remove unnecessary ledge common_template_vars
core.page_header is more powerful and includes all functionality of this one. PHPBB3-9550
This commit is contained in:
parent
4b4e2afd80
commit
1aa7bc81f6
1 changed files with 2 additions and 9 deletions
|
@ -4909,7 +4909,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// The following assigns all _common_ variables that may be used at any point in a template.
|
// The following assigns all _common_ variables that may be used at any point in a template.
|
||||||
$template_vars = array(
|
$template->assign_vars(array(
|
||||||
'SITENAME' => $config['sitename'],
|
'SITENAME' => $config['sitename'],
|
||||||
'SITE_DESCRIPTION' => $config['site_desc'],
|
'SITE_DESCRIPTION' => $config['site_desc'],
|
||||||
'PAGE_TITLE' => $page_title,
|
'PAGE_TITLE' => $page_title,
|
||||||
|
@ -5031,14 +5031,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
|
||||||
'SITE_LOGO_IMG' => $user->img('site_logo'),
|
'SITE_LOGO_IMG' => $user->img('site_logo'),
|
||||||
|
|
||||||
'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')),
|
'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('template_vars');
|
|
||||||
$event = new phpbb_event_data(compact($vars));
|
|
||||||
$phpbb_dispatcher->dispatch('core.common_template_vars', $event);
|
|
||||||
extract($event->get_data_filtered($vars));
|
|
||||||
|
|
||||||
$template->assign_vars($template_vars);
|
|
||||||
|
|
||||||
|
|
||||||
$vars = array('page_title', 'display_online_list', 'item_id', 'item');
|
$vars = array('page_title', 'display_online_list', 'item_id', 'item');
|
||||||
|
|
Loading…
Add table
Reference in a new issue