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

Merge pull request #2455 from Nicofuma/ticket/12509

Browse Source 
[ticket/12509] Add an option to set the path of custom style directory (ie: email templates) for extensions

* Nicofuma/ticket/12509:
  [ticket/12509] Add example in doc block
  [ticket/12509] Add missing ',' in arrays
  [ticket/12509] Update calls to set_custom_style in forgotten places
  [ticket/12509] Fix path in adm/index.php
  [ticket/12509] Fix typo in adm/index.php
  [ticket/12509] Fix doc block
  [ticket/12509] Fix the call to set_custom_file in adm/index and messenger
  [ticket/12509] Update acp custom_style setter
  [ticket/12509] Add an option to set the path of custom file for extensions
This commit is contained in:
Joas Schilling
2014-05-28 00:23:37 +02:00
parent 83fc8725da 05cd25a88b
commit 08c01b7cee
6 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/install/index.php
View File

@@ -250,7 +250,12 @@ $phpbb_path_helper = $phpbb_container->get('path_helper');
$template = new \phpbb\template\twig\twig($phpbb_path_helper, $config, $user, new \phpbb\template\context());
$paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style');
$paths = array_filter($paths, 'is_dir');
$template->set_custom_style('adm', $paths);
$template->set_custom_style(array(
array(
'name' => 'adm',
'ext_path' => 'adm/style/',
),
), $paths);
$path = array_shift($paths);

7
phpBB/install/install_update.php
View File

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