aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/front/controller/visitor/InstallController.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-11-24 13:28:17 +0100
committerArthurHoaro <arthur@hoa.ro>2020-11-24 13:39:35 +0100
commit8a6b7e96b7176e03238bbb1bcaa4c8b0c25e6358 (patch)
treeb0e8910856393fe11a022faf32969915de9f598f /application/front/controller/visitor/InstallController.php
parente4b8330e459b598328bf250208386c06ec257b08 (diff)
downloadShaarli-8a6b7e96b7176e03238bbb1bcaa4c8b0c25e6358.tar.gz
Shaarli-8a6b7e96b7176e03238bbb1bcaa4c8b0c25e6358.tar.zst
Shaarli-8a6b7e96b7176e03238bbb1bcaa4c8b0c25e6358.zip
Fix: soft fail if the mutex is not working
And display the error in server admin page Fixes #1650
Diffstat (limited to 'application/front/controller/visitor/InstallController.php')
-rw-r--r--application/front/controller/visitor/InstallController.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/application/front/controller/visitor/InstallController.php b/application/front/controller/visitor/InstallController.php
index bf965929..418d4a49 100644
--- a/application/front/controller/visitor/InstallController.php
+++ b/application/front/controller/visitor/InstallController.php
@@ -56,11 +56,16 @@ class InstallController extends ShaarliVisitorController
56 56
57 $phpEol = new \DateTimeImmutable(ApplicationUtils::getPhpEol(PHP_VERSION)); 57 $phpEol = new \DateTimeImmutable(ApplicationUtils::getPhpEol(PHP_VERSION));
58 58
59 $permissions = array_merge(
60 ApplicationUtils::checkResourcePermissions($this->container->conf),
61 ApplicationUtils::checkDatastoreMutex()
62 );
63
59 $this->assignView('php_version', PHP_VERSION); 64 $this->assignView('php_version', PHP_VERSION);
60 $this->assignView('php_eol', format_date($phpEol, false)); 65 $this->assignView('php_eol', format_date($phpEol, false));
61 $this->assignView('php_has_reached_eol', $phpEol < new \DateTimeImmutable()); 66 $this->assignView('php_has_reached_eol', $phpEol < new \DateTimeImmutable());
62 $this->assignView('php_extensions', ApplicationUtils::getPhpExtensionsRequirement()); 67 $this->assignView('php_extensions', ApplicationUtils::getPhpExtensionsRequirement());
63 $this->assignView('permissions', ApplicationUtils::checkResourcePermissions($this->container->conf)); 68 $this->assignView('permissions', $permissions);
64 69
65 $this->assignView('pagetitle', t('Install Shaarli')); 70 $this->assignView('pagetitle', t('Install Shaarli'));
66 71