diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 00:23:52 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 00:23:52 +0200 |
| commit | cf12e179441f0ae247be3fd448a4d7fb16e089ec (patch) | |
| tree | df9f4c540aa4013002720079d9952d08021d8131 /phpBB/install | |
| parent | 317ce7b0c7d929fe4b51dce0441ff2752adc0976 (diff) | |
| parent | 08c01b7cee629701dc62b32b03eb5543e8c9d196 (diff) | |
| download | forums-cf12e179441f0ae247be3fd448a4d7fb16e089ec.tar forums-cf12e179441f0ae247be3fd448a4d7fb16e089ec.tar.gz forums-cf12e179441f0ae247be3fd448a4d7fb16e089ec.tar.bz2 forums-cf12e179441f0ae247be3fd448a4d7fb16e089ec.tar.xz forums-cf12e179441f0ae247be3fd448a4d7fb16e089ec.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/index.php | 7 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 85fedaddfc..9d4770981e 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -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); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 87b7d8d703..c2f7b191a7 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -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'], |