Merge branch 'v3.2' into feature/cli_module

# Conflicts:
#	composer.json
#	composer.lock
#	lib/SP/Providers/Auth/Ldap/LdapMsAds.php
#	lib/SP/Services/Install/Installer.php
#	lib/SP/Util/Checks.php
#	lib/SP/Util/Link.php
#	public/js/app-actions.min.js
#	public/js/app-util.min.js
#	tests/res/scripts/reset_db.sh
This commit is contained in:
Rubén D
2021-09-19 21:40:27 +02:00
11 changed files with 7721 additions and 35 deletions

View File

@@ -52,6 +52,12 @@ final class InstallController extends ControllerBase
*/
public function indexAction()
{
if ($this->configData->isInstalled()) {
$this->router->response()
->redirect('index.php?r=login');
return;
}
$layoutHelper = $this->dic->get(LayoutHelper::class);
$layoutHelper->getPublicLayout('index', 'install');