diff --git a/classes/api.php b/classes/api.php index 4d1c15598..62ce1764c 100755 --- a/classes/api.php +++ b/classes/api.php @@ -102,7 +102,7 @@ class API extends Handler { /* Method added for ttrss-reader for Android */ function getCounters() { - $this->wrap(self::STATUS_OK, Counters::getAllCounters()); + $this->wrap(self::STATUS_OK, Counters::get_all()); } function getFeeds() { @@ -510,7 +510,7 @@ class API extends Handler { /* API only: -4 All feeds, including virtual feeds */ if ($cat_id == -4 || $cat_id == -2) { - $counters = Counters::getLabelCounters(true); + $counters = Counters::get_labels(true); foreach (array_values($counters) as $cv) { diff --git a/classes/counters.php b/classes/counters.php index 29ced3d6c..e8c179a95 100644 --- a/classes/counters.php +++ b/classes/counters.php @@ -1,13 +1,13 @@ Counters::getAllCounters(), + 'counters' => Counters::get_all(), 'seq' => $seq ]; @@ -222,7 +222,7 @@ class RPC extends Handler_Protected { Feeds::_catchup($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]); // return counters here synchronously so that frontend can figure out next unread feed properly - print json_encode(['counters' => Counters::getAllCounters()]); + print json_encode(['counters' => Counters::get_all()]); //print json_encode(array("message" => "UPDATE_COUNTERS")); }