fix bugs introduced by two previous patches

2 files changed, 5 insertions, 5 deletions

diff --git a/functions.js b/functions.js
index b17e8927e..60fd9da64 100644
--- a/functions.js
+++ b/functions.js
@@ -358,7 +358,8 @@ if (!xmlhttp_rpc && typeof XMLHttpRequest!='undefined') {
 function parse_counters(reply, f_document, title_obj) {
 	try {
 		for (var l = 0; l < reply.childNodes.length; l++) {
-			if (!reply.childNodes[l] || !reply.childNodes[l].getAttribute) {
+			if (!reply.childNodes[l] ||
+				typeof(reply.childNodes[l].getAttribute) == "undefined") {
 				// where did this come from?
 				continue;
 			}
diff --git a/functions.php b/functions.php
index d34e133ae..97be0da2a 100644
--- a/functions.php
+++ b/functions.php
@@ -861,7 +861,7 @@
 	}
 
 	function sanity_check($link) {
-	
+
 		$error_code = 0;
 		$result = db_query($link, "SELECT schema_version FROM ttrss_version");
 		$schema_version = db_fetch_result($result, 0, "schema_version");
@@ -870,13 +870,12 @@
 			$error_code = 5;
 		}
 
-		print "<error error-code='$error_code'/>";
-
 		if ($error_code != 0) {
+			print "<error error-code='$error_code'/>";
 			return false;
 		} else {
 			return true;
-		}
+		} 
 	}
 
 ?>