From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 4 Nov 2010 20:09:13 +0000 (+0300)
Subject: fix background refresh being broken when no counter data is sent
X-Git-Tag: 1.5.0~408
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a8f447f3985f483588ea8d6e9a0c081e2def6af8;p=tt-rss.git

fix background refresh being broken when no counter data is sent
---

diff --git a/functions.js b/functions.js
index 9a1652ce..c0ba5b34 100644
--- a/functions.js
+++ b/functions.js
@@ -562,11 +562,13 @@ function parse_counters_reply(transport, scheduled_call) {
 
 	var counters = reply.getElementsByTagName("counters")[0];
 	
-	parse_counters(counters, scheduled_call);
+	if (counters)
+		parse_counters(counters, scheduled_call);
 
 	var runtime_info = reply.getElementsByTagName("runtime-info")[0];
 
-	parse_runtime_info(runtime_info);
+	if (runtime_info)
+		parse_runtime_info(runtime_info);
 
 	if (feedsSortByUnread()) {
 		resort_feedlist();
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 228d45a7..5ff35b40 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -293,15 +293,13 @@
 
 			print "<rpc-reply>";
 
-			print "<counters><![CDATA[";
-
 			if ($global_unread_caller != $global_unread) {
+				print "<counters><![CDATA[";
 				$omode = $_REQUEST["omode"];
 				print json_encode(getAllCounters($link, $omode));
+				print "]]></counters>";
 			}
  
-			print "]]></counters>";
-
 			print_runtime_info($link);
 
 			print "</rpc-reply>";