diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-06 09:08:53 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-06 09:08:53 -0500 |
| commit | 65f52d7575a8a7fe83cbfe7c5f35215ef8fba5b0 (patch) | |
| tree | 840e0dc69209f7d73764483bfac68f4c238d37ef /phpBB/install/install_update.php | |
| parent | 11317ef261c7811ea137d19ee38593d289ea6150 (diff) | |
| parent | dd86e8d0ae0179cf50076cdb1a8020266b6432a5 (diff) | |
| download | forums-65f52d7575a8a7fe83cbfe7c5f35215ef8fba5b0.tar forums-65f52d7575a8a7fe83cbfe7c5f35215ef8fba5b0.tar.gz forums-65f52d7575a8a7fe83cbfe7c5f35215ef8fba5b0.tar.bz2 forums-65f52d7575a8a7fe83cbfe7c5f35215ef8fba5b0.tar.xz forums-65f52d7575a8a7fe83cbfe7c5f35215ef8fba5b0.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By David King (16) and others
# Via David King (13) and others
* 'develop' of github.com:phpbb/phpbb3: (67 commits)
[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
[ticket/11215] Remove unnecessary comment
[ticket/11755] MySQL upgrader out of date
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
[ticket/11823] Set up nginx server to match PHP files with characters after .php
[ticket/11812] Fix empty define
[ticket/11818] Update Symfony dependencies to 2.3.*
[ticket/11791] Load adm/ events from styles/adm/event/
[ticket/11215] Fix helper_url_test.php tests
[ticket/11215] Add newline back to .htaccess, fix wording
[ticket/11215] Update comment in .htaccess
[ticket/11215] Uncomment rewrite rules in .htaccess
[ticket/11215] Make controller helper url() method use correct format
[ticket/11215] Add commented-out URL rewrite capability to .htaccess
[ticket/11821] Fix comma usage next to "You are receiving this notification".
[ticket/11769] Allow using 0 as poster name
[ticket/11769] Allow '0' as username
[ticket/11215] Use new URL structure for controllers
[ticket/11215] Everything appears to be working...
...
Conflicts:
phpBB/phpbb/template/twig/lexer.php
tests/template/template_test.php
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 4ae39f202f..8ab0ad49d3 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -70,7 +70,7 @@ class install_update extends module function main($mode, $sub) { - global $phpbb_style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language; + global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language; global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container; // We must enable super globals, otherwise creating a new instance of the request class, @@ -143,7 +143,7 @@ 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'); - $phpbb_style->set_custom_style('admin', $paths, array(), ''); + $template->set_custom_style('adm', $paths); $template->assign_vars(array( 'S_USER_LANG' => $user->lang['USER_LANG'], |