diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-16 00:11:27 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-16 00:11:27 +0100 |
| commit | 8d1eee0e0118510def943e43e3246b2b89a08bdc (patch) | |
| tree | 478bf6c878bacec7c4e60832e0af7d106bd52e52 /phpBB/phpbb/install/module/update_filesystem/task | |
| parent | 1f0b6c8123cdecf2f5f1855ad52a90ef962809a4 (diff) | |
| parent | d0ce6a18df2172a6e9baf1f1c2802efb30b25323 (diff) | |
| download | forums-8d1eee0e0118510def943e43e3246b2b89a08bdc.tar forums-8d1eee0e0118510def943e43e3246b2b89a08bdc.tar.gz forums-8d1eee0e0118510def943e43e3246b2b89a08bdc.tar.bz2 forums-8d1eee0e0118510def943e43e3246b2b89a08bdc.tar.xz forums-8d1eee0e0118510def943e43e3246b2b89a08bdc.zip | |
Merge branch '3.2.x'
* 3.2.x:
[ticket/14462] Not show timeout messages in convertors
[ticket/14462] Make timeout error translateable
[ticket/14462] Update ordering in install db config
[ticket/14462] Fix comments
[ticket/14462] Fix tests
[ticket/14462] Fix CS and typo
[ticket/14462] Set instance of db driver for database access using global
[ticket/14462] Fix installation in tests
[ticket/14462] Refactor tasks to be more modular
[ticket/14462] Further speed improvements
Diffstat (limited to 'phpBB/phpbb/install/module/update_filesystem/task')
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php b/phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php index 9271e8fd50..f911b7ac62 100644 --- a/phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php +++ b/phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php @@ -101,7 +101,6 @@ class download_updated_files extends task_base ), )); - $this->iohandler->send_response(); throw new user_interaction_required_exception(); } } diff --git a/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php b/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php index e712b8ad6a..c46c05500a 100644 --- a/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php +++ b/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php @@ -136,7 +136,6 @@ class show_file_status extends task_base )); // Show results to the user - $this->iohandler->send_response(); throw new user_interaction_required_exception(); } else |