diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-01-04 10:49:57 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-01-04 10:49:57 +0100 |
| commit | 5d091e2d8f5079a8ce8dc14500c29f6642c40e98 (patch) | |
| tree | f4c73527be7e6f5e783351edc306e929a8946b31 /phpBB/install/install_install.php | |
| parent | 4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c (diff) | |
| parent | 228580b6743b9650996284dd04a3f5de6c2447ca (diff) | |
| download | forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.gz forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.bz2 forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.xz forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
phpBB/includes/ucp/ucp_groups.php
Diffstat (limited to 'phpBB/install/install_install.php')
| -rw-r--r-- | phpBB/install/install_install.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 14f6ca30fb..1ab9caee0a 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -52,12 +52,13 @@ class install_install extends module function main($mode, $sub) { - global $lang, $template, $language, $phpbb_root_path, $cache; + global $lang, $template, $language, $phpbb_root_path, $phpEx; + global $phpbb_container, $cache; switch ($sub) { case 'intro': - $cache->purge(); + $phpbb_container->get('cache.driver')->purge(); $this->page_title = $lang['SUB_INTRO']; @@ -101,6 +102,12 @@ class install_install extends module break; case 'final': + // Create a normal container now + $phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx); + + // Sets the global $cache variable + $cache = $phpbb_container->get('cache'); + $this->build_search_index($mode, $sub); $this->add_modules($mode, $sub); $this->add_language($mode, $sub); @@ -1807,7 +1814,7 @@ class install_install extends module */ function email_admin($mode, $sub) { - global $auth, $config, $db, $lang, $template, $user, $phpbb_root_path, $phpEx; + global $auth, $config, $db, $lang, $template, $user, $phpbb_root_path, $phpbb_admin_path, $phpEx; $this->page_title = $lang['STAGE_FINAL']; @@ -1854,7 +1861,7 @@ class install_install extends module 'TITLE' => $lang['INSTALL_CONGRATS'], 'BODY' => sprintf($lang['INSTALL_CONGRATS_EXPLAIN'], $config['version'], append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=convert&language=' . $data['language']), '../docs/README.html'), 'L_SUBMIT' => $lang['INSTALL_LOGIN'], - 'U_ACTION' => append_sid($phpbb_root_path . 'adm/index.' . $phpEx, 'i=send_statistics&mode=send_statistics'), + 'U_ACTION' => append_sid($phpbb_admin_path . 'index.' . $phpEx, 'i=send_statistics&mode=send_statistics'), )); } |