aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-24 12:55:41 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-24 12:56:39 -0500
commit4b761f65758c40db4851983fa3a08d354da3323d (patch)
tree8bc46941ba86b83d190dcb4648f275138215ed85 /phpBB/install
parentbfbc7aa74250ea5e9e39efc63caf7cfdb9407e14 (diff)
downloadforums-4b761f65758c40db4851983fa3a08d354da3323d.tar
forums-4b761f65758c40db4851983fa3a08d354da3323d.tar.gz
forums-4b761f65758c40db4851983fa3a08d354da3323d.tar.bz2
forums-4b761f65758c40db4851983fa3a08d354da3323d.tar.xz
forums-4b761f65758c40db4851983fa3a08d354da3323d.zip
[ticket/11628] Remove third parameter ($names) from set_custom_style
This was basically duplicating functionality. $names would be used if not empty, else array($name) would be used. Merged functionality into the first argument PHPBB3-11628
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/index.php2
-rw-r--r--phpBB/install/install_update.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index fd0d8a2d48..f80b975e2c 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -213,7 +213,7 @@ $config = new phpbb_config(array(
));
$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context());
-$template->set_custom_style('admin', $phpbb_admin_path . 'style', array(), '');
+$template->set_custom_style('admin', $phpbb_admin_path . 'style', '');
$template->assign_var('T_ASSETS_PATH', '../assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 51fbd1975c..63f10c96d7 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -138,7 +138,7 @@ class install_update extends module
}
// Set custom template again. ;)
- $template->set_custom_style('admin', $phpbb_admin_path . 'style', array(), '');
+ $template->set_custom_style('admin', $phpbb_admin_path . 'style', '');
$template->assign_vars(array(
'S_USER_LANG' => $user->lang['USER_LANG'],