[INSTALL] Fixed issue in installing where default.php needs util.php but it's not loaded

This commit is contained in:
Miguel Dantas 2019-06-26 22:38:55 +01:00 committed by Diogo Cordeiro
parent 7643f3cf7b
commit bea06da531

View File

@ -141,6 +141,7 @@ abstract class Installer
define('STATUSNET', true); define('STATUSNET', true);
require_once INSTALLDIR . '/lib/language.php'; require_once INSTALLDIR . '/lib/language.php';
$_server=$this->server; $_path=$this->path; // We won't be using those so it's safe to do this small hack $_server=$this->server; $_path=$this->path; // We won't be using those so it's safe to do this small hack
require_once INSTALLDIR.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'util.php';
require_once INSTALLDIR.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'default.php'; require_once INSTALLDIR.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'default.php';
$fileSubdirs = [empty($this->avatarDir) ? $default['avatar']['dir'] : $this->avatarDir, $fileSubdirs = [empty($this->avatarDir) ? $default['avatar']['dir'] : $this->avatarDir,
empty($this->fileDir) ? $default['attachments']['dir'] : $this->fileDir]; empty($this->fileDir) ? $default['attachments']['dir'] : $this->fileDir];