nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Avoid basepath problems

Browse source
This commit is contained in:
Michael 2017-10-11 18:21:10 +00:00
parent 225eea2ca6
commit 7b833834f9
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/App.php
View file

@ -132,8 +132,14 @@ class App {
$hostname = '';
if (file_exists('.htpreconfig.php')) {
include '.htpreconfig.php';
if (! static::directory_usable($basepath, false)) {
throw new Exception('Basepath ' . $basepath . ' isn\'t usable.');
}
$this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR);
if (file_exists($this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php')) {
include $this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php';
}
$this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
@ -201,12 +207,6 @@ class App {
$this->hostname = $hostname;
}
if (! static::directory_usable($basepath, false)) {
throw new Exception('Basepath ' . $basepath . ' isn\'t usable.');
}
$this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR);
set_include_path(
get_include_path() . PATH_SEPARATOR
. $this->basepath . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR
@ -416,8 +416,8 @@ class App {
$this->path = trim($parsed['path'], '\\/');
}
if (file_exists('.htpreconfig.php')) {
include '.htpreconfig.php';
if (file_exists($this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php')) {
include $this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php';
}
if (Config::get('config', 'hostname') != '') {