From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 7 Jun 2018 18:00:30 +0000 (+0200)
Subject: Merge pull request #1152 from ArthurHoaro/hotfix/install-error
X-Git-Tag: v0.10.0~20
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=26b0b2022870a540c1a6d54e949c4bdc1486daed;hp=ea700dd89fb2b114a34494b824564f48927d5779;p=github%2Fshaarli%2FShaarli.git

Merge pull request #1152 from ArthurHoaro/hotfix/install-error

Fixes an error during the install
---

diff --git a/index.php b/index.php
index c34434dd..89b181cb 100644
--- a/index.php
+++ b/index.php
@@ -174,7 +174,7 @@ if (! is_file($conf->getConfigFileExt())) {
     }
 
     // Display the installation form if no existing config is found
-    install($conf, $sessionManager);
+    install($conf, $sessionManager, $loginManager);
 }
 
 $loginManager->checkLoginState($_COOKIE, $clientIpId);
@@ -1823,8 +1823,9 @@ function lazyThumbnail($conf, $url,$href=false)
  *
  * @param ConfigManager  $conf           Configuration Manager instance.
  * @param SessionManager $sessionManager SessionManager instance
+ * @param LoginManager   $loginManager   LoginManager instance
  */
-function install($conf, $sessionManager) {
+function install($conf, $sessionManager, $loginManager) {
     // On free.fr host, make sure the /sessions directory exists, otherwise login will not work.
     if (endsWith($_SERVER['HTTP_HOST'],'.free.fr') && !is_dir($_SERVER['DOCUMENT_ROOT'].'/sessions')) mkdir($_SERVER['DOCUMENT_ROOT'].'/sessions',0705);