mirror of
https://github.com/friendica/friendica
synced 2024-12-22 18:40:17 +00:00
Merge branch 'develop' into refactoring-of-app-class
This commit is contained in:
commit
46f6a041a0
1 changed files with 0 additions and 7 deletions
|
@ -314,13 +314,6 @@ class App implements AppHelper
|
||||||
// Ensure that all "strtotime" operations do run timezone independent
|
// Ensure that all "strtotime" operations do run timezone independent
|
||||||
date_default_timezone_set('UTC');
|
date_default_timezone_set('UTC');
|
||||||
|
|
||||||
set_include_path(
|
|
||||||
get_include_path() . PATH_SEPARATOR
|
|
||||||
. $this->appHelper->getBasePath() . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR
|
|
||||||
. $this->appHelper->getBasePath() . DIRECTORY_SEPARATOR . 'library' . PATH_SEPARATOR
|
|
||||||
. $this->appHelper->getBasePath()
|
|
||||||
);
|
|
||||||
|
|
||||||
$this->profiler->reset();
|
$this->profiler->reset();
|
||||||
|
|
||||||
if ($this->mode->has(Mode::DBAVAILABLE)) {
|
if ($this->mode->has(Mode::DBAVAILABLE)) {
|
||||||
|
|
Loading…
Reference in a new issue