Knah-Tsaeb
/
MyShaarli
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Fixes an error during the install
This commit is contained in:
ArthurHoaro 2018-06-07 20:00:30 +02:00 committed by GitHub
parent ea700dd89f cad4251ad7
commit 26b0b20228
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
index.php
View File

@ -174,7 +174,7 @@ if (! is_file($conf->getConfigFileExt())) {
} }
// Display the installation form if no existing config is found // Display the installation form if no existing config is found
install($conf, $sessionManager); install($conf, $sessionManager, $loginManager);
} }
$loginManager->checkLoginState($_COOKIE, $clientIpId); $loginManager->checkLoginState($_COOKIE, $clientIpId);
@ -1823,8 +1823,9 @@ function lazyThumbnail($conf, $url,$href=false)
* *
* @param ConfigManager $conf Configuration Manager instance. * @param ConfigManager $conf Configuration Manager instance.
* @param SessionManager $sessionManager SessionManager 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. // 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); if (endsWith($_SERVER['HTTP_HOST'],'.free.fr') && !is_dir($_SERVER['DOCUMENT_ROOT'].'/sessions')) mkdir($_SERVER['DOCUMENT_ROOT'].'/sessions',0705);