diff --git a/index.php b/index.php index 47264362c..e98987289 100644 --- a/index.php +++ b/index.php @@ -12,6 +12,6 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) { require __DIR__ . '/vendor/autoload.php'; -$a = Factory\DependencyFactory::setUp('index', __DIR__, true); +$a = Factory\DependencyFactory::setUp('index', __DIR__, false); $a->runFrontend(); diff --git a/src/App.php b/src/App.php index ca2b6dfc2..f41d486b5 100644 --- a/src/App.php +++ b/src/App.php @@ -214,18 +214,18 @@ class App */ public function __construct(Configuration $config, LoggerInterface $logger, Profiler $profiler, $isBackend = true) { + BaseObject::setApp($this); + $this->logger = $logger; $this->config = $config; $this->profiler = $profiler; - $this->basePath = $this->config->get('system', 'basepath'); + $this->basePath = $this->config->getCache()->get('system', 'basepath'); if (!Core\System::isDirectoryUsable($this->basePath, false)) { - throw new Exception('Basepath ' . $this->basePath . ' isn\'t usable.'); + throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.'); } $this->basePath = rtrim($this->basePath, DIRECTORY_SEPARATOR); - BaseObject::setApp($this); - $this->checkBackend($isBackend); $this->checkFriendicaApp();