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

Merge pull request #965 from romainneutron/host-configuration

Browse Source 
[3.9] Add configuration per host
This commit is contained in:
Nicolas Le Goff
2014-02-24 12:30:26 +01:00
parent 50aa029fc7 a6bfcd95f4
commit 4535491e6c
44 changed files with 1051 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,9 +199,7 @@ class API_V1_result
$this->app['dispatcher']->dispatch(PhraseaEvents::API_RESULT, new ApiResultEvent());
$conf = $this->app['configuration.store'];
if (isset($conf['main']['api-timers']) && true === $conf['main']['api-timers']) {
if ($this->app['conf']->get(['main', 'api-timers'], false)) {
$ret['timers'] = $this->app['api.timers']->toArray();
}