aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-03-16 11:47:27 +0100
committerJoas Schilling <nickvergessen@gmx.de>2012-08-01 10:18:43 +0200
commit1aa7bc81f6200389499080fa3863f6708d94dc70 (patch)
tree27e61da38c00f4c4acaa6319f62404a751d9f2b7 /phpBB/includes
parent4b4e2afd800d34b2f92f709f9199c38334f43b29 (diff)
downloadforums-1aa7bc81f6200389499080fa3863f6708d94dc70.tar
forums-1aa7bc81f6200389499080fa3863f6708d94dc70.tar.gz
forums-1aa7bc81f6200389499080fa3863f6708d94dc70.tar.bz2
forums-1aa7bc81f6200389499080fa3863f6708d94dc70.tar.xz
forums-1aa7bc81f6200389499080fa3863f6708d94dc70.zip
[feature/events] Remove unnecessary ledge common_template_vars
core.page_header is more powerful and includes all functionality of this one. PHPBB3-9550
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php11
1 files changed, 2 insertions, 9 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index a16e8d6eeb..de0cb8766b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -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.
- $template_vars = array(
+ $template->assign_vars(array(
'SITENAME' => $config['sitename'],
'SITE_DESCRIPTION' => $config['site_desc'],
'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'),
'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');