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

Merge remote-tracking branch 'mvinny/ticket/11139' into develop

Browse source 
* mvinny/ticket/11139:
  [ticket/11139] Adding the $phpbb_admin_path variable
  [ticket/11139] Fix fatal error on colour swatch window
This commit is contained in:
Andreas Fischer 2012-10-15 19:49:28 +02:00
commit 72f0e2dd79
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/adm/swatch.php
View file

@ -21,8 +21,10 @@ $user->session_begin(false);
$auth->acl($user->data); $auth->acl($user->data);
$user->setup(); $user->setup();
$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './';
// Set custom template for admin area // Set custom template for admin area
$template->set_custom_template($phpbb_root_path . 'adm/style', 'admin'); $phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', '');
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'colour_swatch.html') 'body' => 'colour_swatch.html')