aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2018-06-07 20:00:30 +0200
committerGitHub <noreply@github.com>2018-06-07 20:00:30 +0200
commit26b0b2022870a540c1a6d54e949c4bdc1486daed (patch)
tree869df1d3706edf2164219a7a1069fc1a3f998c4e
parentea700dd89fb2b114a34494b824564f48927d5779 (diff)
parentcad4251ad759ed28bd16eb3912239fb3c4a7e1e3 (diff)
downloadShaarli-26b0b2022870a540c1a6d54e949c4bdc1486daed.tar.gz
Shaarli-26b0b2022870a540c1a6d54e949c4bdc1486daed.tar.zst
Shaarli-26b0b2022870a540c1a6d54e949c4bdc1486daed.zip
Merge pull request #1152 from ArthurHoaro/hotfix/install-error
Fixes an error during the install
-rw-r--r--index.php5
1 files changed, 3 insertions, 2 deletions
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())) {
174 } 174 }
175 175
176 // Display the installation form if no existing config is found 176 // Display the installation form if no existing config is found
177 install($conf, $sessionManager); 177 install($conf, $sessionManager, $loginManager);
178} 178}
179 179
180$loginManager->checkLoginState($_COOKIE, $clientIpId); 180$loginManager->checkLoginState($_COOKIE, $clientIpId);
@@ -1823,8 +1823,9 @@ function lazyThumbnail($conf, $url,$href=false)
1823 * 1823 *
1824 * @param ConfigManager $conf Configuration Manager instance. 1824 * @param ConfigManager $conf Configuration Manager instance.
1825 * @param SessionManager $sessionManager SessionManager instance 1825 * @param SessionManager $sessionManager SessionManager instance
1826 * @param LoginManager $loginManager LoginManager instance
1826 */ 1827 */
1827function install($conf, $sessionManager) { 1828function install($conf, $sessionManager, $loginManager) {
1828 // On free.fr host, make sure the /sessions directory exists, otherwise login will not work. 1829 // On free.fr host, make sure the /sessions directory exists, otherwise login will not work.
1829 if (endsWith($_SERVER['HTTP_HOST'],'.free.fr') && !is_dir($_SERVER['DOCUMENT_ROOT'].'/sessions')) mkdir($_SERVER['DOCUMENT_ROOT'].'/sessions',0705); 1830 if (endsWith($_SERVER['HTTP_HOST'],'.free.fr') && !is_dir($_SERVER['DOCUMENT_ROOT'].'/sessions')) mkdir($_SERVER['DOCUMENT_ROOT'].'/sessions',0705);
1830 1831