diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Command/Maintenance/Install.php | 2 | ||||
| -rw-r--r-- | core/Controller/SetupController.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index c06cffe7dfc..d53cd867b06 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -107,7 +107,7 @@ class Install extends Command { $this->printErrors($output, $errors); return 1; } - if ($setupHelper->canInstallExists()) { + if ($setupHelper->shouldRemoveCanInstallFile()) { $output->writeln('<warn>Could not remove CAN_INSTALL from the config folder. Please remove this file manually.</warn>'); } $output->writeln("Nextcloud was successfully installed"); 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'); } |