From d7c8f86553e22fd55b43c609f8adeb55f801fede Mon Sep 17 00:00:00 2001
From: following <following>
Date: Mon, 25 Mar 2013 16:28:06 +0100
Subject: [PATCH] fixed db error recursion handling (commit 40f324b)

---
 htdocs/html/dberror.php | 6 ++----
 htdocs/lib2/db.inc.php  | 5 ++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/html/dberror.php b/htdocs/html/dberror.php
index 390cbf6b..d7b1164a 100644
--- a/htdocs/html/dberror.php
+++ b/htdocs/html/dberror.php
@@ -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>
diff --git a/htdocs/lib2/db.inc.php b/htdocs/lib2/db.inc.php
index 1fcc8214..b1e9362b 100644
--- a/htdocs/lib2/db.inc.php
+++ b/htdocs/lib2/db.inc.php
@@ -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;
 		}