mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

[feature/merging-style-components] Updating style initialization

Browse Source 
Changing template initialization to style initialization.

PHPBB3-10632
This commit is contained in:
Vjacheslav Trushkin
2012-03-15 21:11:34 +02:00
parent 1ce4d4c4fc
commit fd96f97dc3
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/index.php
View File

@@ -202,9 +202,9 @@ $config = new phpbb_config(array(
));
$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, false);
$style->set_ext_dir_prefix('adm/');
$style->set_custom_style('admin', '../adm/style', '');
$template = $style->template;
$template->set_ext_dir_prefix('adm/');
$template->set_custom_template('../adm/style', 'admin');
$template->assign_var('T_ASSETS_PATH', '../assets');
$template->assign_var('T_TEMPLATE_PATH', '../adm/style');

4
phpBB/install/install_update.php
View File

@@ -71,7 +71,7 @@ class install_update extends module
function main($mode, $sub)
{
global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
global $style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
global $request;
$this->tpl_name = 'install_update';
@@ -131,7 +131,7 @@ class install_update extends module
}
// Set custom template again. ;)
$template->set_custom_template('../adm/style', 'admin');
$style->set_custom_style('admin', '../adm/style', '');
$template->assign_vars(array(
'S_USER_LANG' => $user->lang['USER_LANG'],