diff options
| author | Alex Harpin <development@landsofshadow.co.uk> | 2021-06-19 21:06:57 +0100 |
|---|---|---|
| committer | Alex Harpin <development@landsofshadow.co.uk> | 2023-01-10 11:59:06 +0000 |
| commit | 644df591b138d28b1631ecc13ebe600c16a909f1 (patch) | |
| tree | ecfae936f082eaf0f898008bddc82e2fd5357e87 /core/Controller/SetupController.php | |
| parent | d5b52ddd21bc32d250d1d8d3d4308c00d505a0cf (diff) | |
| download | nextcloud-server-644df591b138d28b1631ecc13ebe600c16a909f1.tar.gz nextcloud-server-644df591b138d28b1631ecc13ebe600c16a909f1.zip | |
Rename canInstallExists method and add new method for removal
Rename canInstallExists to shouldRemoveCanInstallFile to cover removal of this file for non-git channels and logging any failure to remove it.
Add new method to detect if this file exists during web based installation.
Signed-off-by: Alex Harpin <development@landsofshadow.co.uk>
Diffstat (limited to 'core/Controller/SetupController.php')
| -rw-r--r-- | core/Controller/SetupController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php index b4f41b48da2..cdab39edf84 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -59,7 +59,7 @@ class SetupController { $post['dbpass'] = $post['dbpassword']; } - if (!$this->setupHelper->canInstallExists()) { + if (!$this->setupHelper->canInstallFileExists()) { $this->displaySetupForbidden(); return; } @@ -107,7 +107,7 @@ class SetupController { } \OC::$server->getIntegrityCodeChecker()->runInstanceVerification(); - if ($this->setupHelper->canInstallExists()) { + if ($this->setupHelper->shouldRemoveCanInstallFile()) { \OC_Template::printGuestPage('', 'installation_incomplete'); } |