clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6682 from nupplaphil/dfactory_fix 

Bugfix App
This commit is contained in:
Hypolite Petovan 2019-02-17 20:57:09 -05:00 committed by GitHub
parent 256e845c5d 95deff1685
commit bc48274c40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -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();

8
src/App.php
View File

@ -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();