diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2020-11-12 13:11:07 +0100 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2020-11-12 13:11:07 +0100 |
| commit | af50eba28a7bd286de4c8c9ee6dc5216b915d149 (patch) | |
| tree | ffa30a9358e82d27be75d8fc5e57f3c8820dc6d3 /application/api/controllers/Info.php | |
| parent | b6f678a5a1d15acf284ebcec16c905e976671ce1 (diff) | |
| parent | 1409f1c89a7ca01456ae2dcd6357d296e2b99f5a (diff) | |
| download | Shaarli-af50eba28a7bd286de4c8c9ee6dc5216b915d149.tar.gz Shaarli-af50eba28a7bd286de4c8c9ee6dc5216b915d149.tar.zst Shaarli-af50eba28a7bd286de4c8c9ee6dc5216b915d149.zip | |
Merge tag 'v0.12.1' into latestlatest
v0.12.1
Diffstat (limited to 'application/api/controllers/Info.php')
| -rw-r--r-- | application/api/controllers/Info.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/api/controllers/Info.php b/application/api/controllers/Info.php index 12f6b2f0..ae7db93e 100644 --- a/application/api/controllers/Info.php +++ b/application/api/controllers/Info.php | |||
| @@ -29,13 +29,13 @@ class Info extends ApiController | |||
| 29 | $info = [ | 29 | $info = [ |
| 30 | 'global_counter' => $this->bookmarkService->count(), | 30 | 'global_counter' => $this->bookmarkService->count(), |
| 31 | 'private_counter' => $this->bookmarkService->count(BookmarkFilter::$PRIVATE), | 31 | 'private_counter' => $this->bookmarkService->count(BookmarkFilter::$PRIVATE), |
| 32 | 'settings' => array( | 32 | 'settings' => [ |
| 33 | 'title' => $this->conf->get('general.title', 'Shaarli'), | 33 | 'title' => $this->conf->get('general.title', 'Shaarli'), |
| 34 | 'header_link' => $this->conf->get('general.header_link', '?'), | 34 | 'header_link' => $this->conf->get('general.header_link', '?'), |
| 35 | 'timezone' => $this->conf->get('general.timezone', 'UTC'), | 35 | 'timezone' => $this->conf->get('general.timezone', 'UTC'), |
| 36 | 'enabled_plugins' => $this->conf->get('general.enabled_plugins', []), | 36 | 'enabled_plugins' => $this->conf->get('general.enabled_plugins', []), |
| 37 | 'default_private_links' => $this->conf->get('privacy.default_private_links', false), | 37 | 'default_private_links' => $this->conf->get('privacy.default_private_links', false), |
| 38 | ), | 38 | ], |
| 39 | ]; | 39 | ]; |
| 40 | 40 | ||
| 41 | return $response->withJson($info, 200, $this->jsonStyle); | 41 | return $response->withJson($info, 200, $this->jsonStyle); |