From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Mon, 20 Feb 2006 04:29:52 +0000 (+0100)
Subject: print additional info on fatalError(3)
X-Git-Tag: schema_freeze_for_1.1.4~57
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=91d612b39e1dcc3b25d707019a071506d08f9dd5;p=tt-rss.git

print additional info on fatalError(3)
---

diff --git a/error.php b/error.php
index cc57b64d..8c5a6a4b 100644
--- a/error.php
+++ b/error.php
@@ -62,7 +62,12 @@
 		
 		<h1>Fatal Error</h1>
 
-		<div class="bigErrorMsg"><?= $ERRORS[$_GET["c"]] ?></div>
+		<div class="bigErrorMsg"><?= $ERRORS[$_GET["c"]] ?>
+
+		<? if ($_GET["p"]) { ?>
+			<p><?= htmlspecialchars($_GET["p"]) ?></p>
+		<? } ?>
+		</div>
 
 	</td>
 </tr>
diff --git a/functions.js b/functions.js
index 8d59bd32..26db6bb5 100644
--- a/functions.js
+++ b/functions.js
@@ -524,8 +524,13 @@ function hideOrShowFeeds(doc, hide) {
 
 }
 
-function fatalError(code) {
-	window.location = "error.php?c=" + param_escape(code);
+function fatalError(code, params) {
+	if (!params) {
+		window.location = "error.php?c=" + param_escape(code);
+	} else {
+		window.location = "error.php?c=" + param_escape(code) + 
+			"&p=" + param_escape(params);
+	}
 }
 
 function selectTableRow(r, do_select) {
diff --git a/tt-rss.js b/tt-rss.js
index 4deac445..758db771 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -143,14 +143,14 @@ function backend_sanity_check_callback() {
 		try {
 		
 			if (!xmlhttp.responseXML) {
-				fatalError(3);
+				fatalError(3, "D001;" + xmlhttp.responseText);
 				return;
 			}
 	
 			var reply = xmlhttp.responseXML.firstChild;
 	
 			if (!reply) {
-				fatalError(3);
+				fatalError(3, "D002;" + xmlhttp.responseText);
 				return;
 			}