diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-01-27 05:39:13 +0000 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-01-27 05:39:13 +0000 |
| commit | 59b94a9e455dabd54dfc7684637333826d70306f (patch) | |
| tree | 4d4665560f621240da7d9ba3e396bd5583485235 /classes/API.php | |
| parent | 0eb4571c193b976d55c548c3a7835a47549ca180 (diff) | |
| parent | d361c1c65d912358c9a9eee1db1992ff532eb299 (diff) | |
Merge branch 'feed-icons-misc' into 'master'
Feed icons cleanup
See merge request tt-rss/tt-rss!99
Diffstat (limited to 'classes/API.php')
| -rw-r--r-- | classes/API.php | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/classes/API.php b/classes/API.php index 241663b3d..72c65ea54 100644 --- a/classes/API.php +++ b/classes/API.php @@ -366,22 +366,19 @@ class API extends Handler { } /** + * @see RPC::_make_init_params() + * @see RPC::_make_runtime_info() * @return array<string, array<string, string>|bool|int|string> */ private function _get_config(): array { - $config = [ - "icons_dir" => Config::get(Config::ICONS_DIR), - "icons_url" => Config::get(Config::ICONS_URL) + return [ + 'custom_sort_types' => $this->_get_custom_sort_types(), + 'daemon_is_running' => file_is_locked('update_daemon.lock'), + 'icons_url' => Config::get_self_url() . '/public.php', + 'num_feeds' => ORM::for_table('ttrss_feeds') + ->where('owner_uid', $_SESSION['uid']) + ->count(), ]; - - $config["daemon_is_running"] = file_is_locked("update_daemon.lock"); - $config["custom_sort_types"] = $this->_get_custom_sort_types(); - - $config["num_feeds"] = ORM::for_table('ttrss_feeds') - ->where('owner_uid', $_SESSION['uid']) - ->count(); - - return $config; } function getConfig(): bool { |