summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--error.php7
-rw-r--r--functions.js9
-rw-r--r--tt-rss.js4
3 files changed, 15 insertions, 5 deletions
diff --git a/error.php b/error.php
index cc57b64db..8c5a6a4b5 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 8d59bd321..26db6bb5f 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 4deac4456..758db7715 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;
}