valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2010-11-11 09:56:03 +03:00
parent 96811a55e6
commit d36f560740
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend.php
View File

@ -387,11 +387,11 @@
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("20", $timing_info); 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 "<counters><![CDATA[";
print json_encode(getAllCounters($link, $omode, $feed)); print json_encode(getAllCounters($link, $omode, $feed));
print "]]></counters>"; print "]]></counters>";
} */ }
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("30", $timing_info); if ($_REQUEST["debug"]) $timing_info = print_checkpoint("30", $timing_info);

2
functions.php
View File

@ -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']; if (!$owner_uid) $owner_uid = $_SESSION['uid'];

5
viewfeed.js
View File

@ -202,7 +202,10 @@ function headlines_callback2(transport, feed_cur_page) {
console.log("no cached articles received"); console.log("no cached articles received");
} }
request_counters(); if (counters)
parse_counters(counters);
else
request_counters();
if (runtime_info) { if (runtime_info) {
parse_runtime_info(runtime_info[0]); parse_runtime_info(runtime_info[0]);