From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 11 Nov 2010 06:56:03 +0000 (+0300)
Subject: viewfeed: return counters when subop is present or when in CDM
X-Git-Tag: 1.5.0~296
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d36f560740ee03a7a224058578a88182cb0d3a71;p=tt-rss.git

viewfeed: return counters when subop is present or when in CDM
---

diff --git a/backend.php b/backend.php
index 5e963f1e..d9b44aef 100644
--- a/backend.php
+++ b/backend.php
@@ -387,11 +387,11 @@
 
 			if ($_REQUEST["debug"]) $timing_info = print_checkpoint("20", $timing_info);
 
-			/* if (get_pref($link, 'COMBINED_DISPLAY_MODE') || $subop || !$offset) {
+			 if (get_pref($link, 'COMBINED_DISPLAY_MODE') || $subop) {
 				print "<counters><![CDATA[";
 				print json_encode(getAllCounters($link, $omode, $feed));
 				print "]]></counters>";
-			} */
+			} 
 
 			if ($_REQUEST["debug"]) $timing_info = print_checkpoint("30", $timing_info);
 
diff --git a/functions.php b/functions.php
index d5852bde..a9a7cea5 100644
--- a/functions.php
+++ b/functions.php
@@ -2321,7 +2321,7 @@
 		}
 	}
 
-	function catchup_feed($link, $feed, $cat_view, $owner_uid) {
+	function catchup_feed($link, $feed, $cat_view, $owner_uid = false) {
 
 			if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
diff --git a/viewfeed.js b/viewfeed.js
index 92564da6..f46b9786 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -201,8 +201,11 @@ function headlines_callback2(transport, feed_cur_page) {
 			} else {
 				console.log("no cached articles received");
 			}
-	
-			request_counters();
+
+			if (counters)
+				parse_counters(counters);
+			else
+				request_counters();
 
 			if (runtime_info) {
 				parse_runtime_info(runtime_info[0]);