diff options
| author | yude <yudesleepy@gmail.com> | 2021-01-04 18:51:10 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 18:51:10 +0900 |
| commit | e6754f2154a79abd8e5e64bd923f6984aa9ad44b (patch) | |
| tree | f074119530bb59ef155938ea367f719f1e4b70f1 /application/api/controllers/Info.php | |
| parent | 5256b4287021342a9f8868967b2a77e481314331 (diff) | |
| parent | ed4ee8f0297941ac83300389b7de6a293312d20e (diff) | |
| download | Shaarli-e6754f2154a79abd8e5e64bd923f6984aa9ad44b.tar.gz Shaarli-e6754f2154a79abd8e5e64bd923f6984aa9ad44b.tar.zst Shaarli-e6754f2154a79abd8e5e64bd923f6984aa9ad44b.zip | |
Merge pull request #2 from shaarli/master
Merge fork source
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); |