OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed db error recursion handling (commit 40f324b)

Browse Source
This commit is contained in:
following
2013-03-25 16:28:06 +01:00
parent 244b53939c
commit d7c8f86553
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/html/dberror.php
View File

@ -26,17 +26,15 @@
<div id="content">
<h1>Fehler beim Datenbankzugriff</h1>
<?php
require('lib/settings.inc.php');
echo '<p>Entschuldigung, bei der Darstellung der Seite ist ein interner Fehler aufgetreten.
Falls dieses Problem für längere Zeit bestehen sollte, informiere uns bitte per
<a href="mailto:' . $emailaddr . '">Email</a>.</p>
<a href="mailto:contact@opencaching.de">Email</a>.</p>
<p>' . $dberrmsg . '</p>
<p><a href="index.php">Zurück zur Startseite</a></p>
<p><br /><br /><em>An error occured while displaying the requested page.
If this problem persists for a longer time, please inform us via
<a href="mailto:' . $emailaddr . '">email</a>.</em></p>';
<a href="mailto:contact@opencaching.de">email</a>.</em></p>';
?>
</div>
</body>

5
htdocs/lib2/db.inc.php
View File

@ -895,7 +895,10 @@
// build the error template (e.g. because connection was lost, or an error mail
// could not load translations from database)
$dberrmsg = 'MySQL error (' . $errno . '): ' . $error;
if ($opt['db']['error']['display'] == true)
$dberrmsg = 'MySQL error (' . $errno . '): ' . $error;
else
$dberrmsg = "";
require("html/dberror.php");
exit;
}