makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'EXreaction/ticket/11791' into develop

Browse source
This commit is contained in:
David King 2013-09-02 16:45:12 -07:00
commit 8d6b03c438
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/index.php
View file

@ -50,7 +50,7 @@ $module_id = request_var('i', '');
$mode = request_var('mode', ''); $mode = request_var('mode', '');
// Set custom style for admin area // Set custom style for admin area
$template->set_custom_style('admin', $phpbb_admin_path . 'style'); $template->set_custom_style('adm', $phpbb_admin_path . 'style');
$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets'); $template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');

2
phpBB/adm/swatch.php
View file

@ -22,7 +22,7 @@ $auth->acl($user->data);
$user->setup(); $user->setup();
// Set custom template for admin area // Set custom template for admin area
$template->set_custom_style('admin', $phpbb_admin_path . 'style'); $template->set_custom_style('adm', $phpbb_admin_path . 'style');
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'colour_swatch.html') 'body' => 'colour_swatch.html')

2
phpBB/includes/functions_module.php
View file

@ -508,7 +508,7 @@ class p_master
if (is_dir($module_style_dir)) if (is_dir($module_style_dir))
{ {
$template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style')); $template->set_custom_style('adm', array($module_style_dir, $phpbb_admin_path . 'style'));
} }
} }

2
phpBB/install/index.php
View file

@ -247,7 +247,7 @@ $config = new phpbb_config(array(
$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context()); $template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context());
$paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style');
$paths = array_filter($paths, 'is_dir'); $paths = array_filter($paths, 'is_dir');
$template->set_custom_style('admin', $paths); $template->set_custom_style('adm', $paths);
$template->assign_var('T_ASSETS_PATH', '../assets'); $template->assign_var('T_ASSETS_PATH', '../assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');

2
phpBB/install/install_update.php
View file

@ -143,7 +143,7 @@ class install_update extends module
// Set custom template again. ;) // Set custom template again. ;)
$paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style');
$paths = array_filter($paths, 'is_dir'); $paths = array_filter($paths, 'is_dir');
$template->set_custom_style('admin', $paths); $template->set_custom_style('adm', $paths);
$template->assign_vars(array( $template->assign_vars(array(
'S_USER_LANG' => $user->lang['USER_LANG'], 'S_USER_LANG' => $user->lang['USER_LANG'],