aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/install_update.php
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2012-12-12 16:30:50 -0600
committerNathaniel Guse <nathaniel.guse@gmail.com>2012-12-12 16:30:50 -0600
commit7ae5b62fc68017b6bdd5e55c9641e92a86a1f487 (patch)
tree54e156815f13c40e9b880712de32ae13728ffdae /phpBB/install/install_update.php
parent84284a9ccee7d5ccc658c3d1f751a5254b3b9175 (diff)
parent9420647c43b300699afe6fe72f09d1746daf64a2 (diff)
downloadforums-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/install_update.php')
-rw-r--r--phpBB/install/install_update.php2
1 files changed, 1 insertions, 1 deletions
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'],