Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-12 10:24:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Separate default config values between file-only and admin settings

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-16 19:07:46 -04:00
parent 67dc08d120
commit bad2774817
3 changed files with 193 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/App.php
View file

@ -323,7 +323,8 @@ class App
*/
private function loadConfigFiles()
{
$this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'defaults.ini.php');
$this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'config.ini.php');
$this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'settings.ini.php');
// Legacy .htconfig.php support
if (file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htpreconfig.php')) {