diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-01 21:52:29 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-01 21:52:29 +0100 |
| commit | 43ffffca5f376aacaba9dce85f78dce4e289a1bc (patch) | |
| tree | 13f44fb1d97dbbb7459aba80c549a4d73c6aa116 /phpBB/phpbb/install/installer.php | |
| parent | b324cf1907e2f35ed9689162eb03ceba2358f358 (diff) | |
| parent | a38a6ec7f551ca0c5c81969520ad6390e69b0a60 (diff) | |
| download | forums-43ffffca5f376aacaba9dce85f78dce4e289a1bc.tar forums-43ffffca5f376aacaba9dce85f78dce4e289a1bc.tar.gz forums-43ffffca5f376aacaba9dce85f78dce4e289a1bc.tar.bz2 forums-43ffffca5f376aacaba9dce85f78dce4e289a1bc.tar.xz forums-43ffffca5f376aacaba9dce85f78dce4e289a1bc.zip | |
Merge branch '3.2.x'
Diffstat (limited to 'phpBB/phpbb/install/installer.php')
| -rw-r--r-- | phpBB/phpbb/install/installer.php | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php index b5709e96c7..240423ae78 100644 --- a/phpBB/phpbb/install/installer.php +++ b/phpBB/phpbb/install/installer.php @@ -22,6 +22,7 @@ use phpbb\install\exception\resource_limit_reached_exception; use phpbb\install\exception\user_interaction_required_exception; use phpbb\install\helper\config; use phpbb\install\helper\container_factory; +use phpbb\install\helper\iohandler\ajax_iohandler; use phpbb\install\helper\iohandler\cli_iohandler; use phpbb\install\helper\iohandler\iohandler_interface; use phpbb\path_helper; @@ -126,6 +127,11 @@ class installer */ public function run() { + if ($this->iohandler instanceof ajax_iohandler) + { + $this->iohandler->acquire_lock(); + } + // Load install progress $this->install_config->load_config(); @@ -174,7 +180,16 @@ class installer try { $iterator = $this->installer_modules->getIterator(); - $iterator->seek($module_index); + + if ($module_index < $iterator->count()) + { + $iterator->seek($module_index); + } + else + { + $iterator->seek($module_index - 1); + $iterator->next(); + } while ($iterator->valid()) { @@ -256,6 +271,11 @@ class installer $fail_cleanup = true; } + if ($this->iohandler instanceof ajax_iohandler) + { + $this->iohandler->release_lock(); + } + if ($install_finished) { // Send install finished message |