diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-12-12 16:30:50 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-12-12 16:30:50 -0600 |
| commit | 7ae5b62fc68017b6bdd5e55c9641e92a86a1f487 (patch) | |
| tree | 54e156815f13c40e9b880712de32ae13728ffdae /phpBB/install | |
| parent | 84284a9ccee7d5ccc658c3d1f751a5254b3b9175 (diff) | |
| parent | 9420647c43b300699afe6fe72f09d1746daf64a2 (diff) | |
| download | forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar.gz forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar.bz2 forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar.xz forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/index.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 09560946a6..2be5adaaac 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -215,7 +215,7 @@ $phpbb_style_path_provider = new phpbb_style_path_provider(); $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, new phpbb_template_context()); $phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template); $phpbb_style->set_ext_dir_prefix('adm/'); -$phpbb_style->set_custom_style('admin', '../adm/style', ''); +$phpbb_style->set_custom_style('admin', '../adm/style', array(), ''); $template->assign_var('T_ASSETS_PATH', '../assets'); $template->assign_var('T_TEMPLATE_PATH', '../adm/style'); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 7f40015002..d71752f9c6 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -131,7 +131,7 @@ class install_update extends module } // Set custom template again. ;) - $phpbb_style->set_custom_style('admin', '../adm/style', ''); + $phpbb_style->set_custom_style('admin', '../adm/style', array(), ''); $template->assign_vars(array( 'S_USER_LANG' => $user->lang['USER_LANG'], |