hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-08 10:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move main "languages" and "servername" to top level, "task-manager" and "binaries" to main configuration

Browse Source
This commit is contained in:
Romain Neutron
2013-11-18 15:15:44 +01:00
parent af807431b1
commit c3df531f59
15 changed files with 168 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/API/V1/adapter.php
View File

@@ -307,7 +307,7 @@ class API_V1_adapter extends API_V1_Abstract
$ret['phraseanet']['debug'] = $app['debug'];
$ret['phraseanet']['maintenance'] = $app['conf']->get(['main', 'maintenance']);
$ret['phraseanet']['errorsLog'] = $app['debug'];
$ret['phraseanet']['serverName'] = $app['conf']->get(['main', 'servername']);
$ret['phraseanet']['serverName'] = $app['conf']->get('servername');
return $ret;
}
@@ -325,7 +325,7 @@ class API_V1_adapter extends API_V1_Abstract
$SEStatus = ['error' => $e->getMessage()];
}
$binaries = $app['conf']->get('binaries');
$binaries = $app['conf']->get(['main', 'binaries']);
return [
'global_values' => [