From 74ffda8261d4cbe763e9fb610881e36edf5f9b4d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 14 Nov 2014 17:13:51 +0100
Subject: [PATCH] do not output DB information, and do not set header

---
 lib/private/db/adapter.php          |  8 +++++++-
 lib/private/db/adaptersqlite.php    | 16 ++++++++++++++--
 lib/private/db/statementwrapper.php | 11 +++++++----
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index 86f867d099f..58b3514b922 100644
--- a/lib/private/db/adapter.php
+++ b/lib/private/db/adapter.php
@@ -71,7 +71,13 @@ class Adapter {
 			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
 			$entry .= 'Offending command was: ' . $query.'<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
-			throw new \OC\HintException($entry);
+			$l = \OC::$server->getL10N('lib');
+			throw new \OC\HintException(
+				$l->t('Database Error'),
+				$l->t('Please contact your system administrator.'),
+				0,
+				$e
+			);
 		}
 	}
 }
diff --git a/lib/private/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php
index 39e2491ed08..c5dfa85aaac 100644
--- a/lib/private/db/adaptersqlite.php
+++ b/lib/private/db/adaptersqlite.php
@@ -41,7 +41,13 @@ class AdapterSqlite extends Adapter {
 			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
 			$entry .= 'Offending command was: ' . $query . '<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
-			throw new \OC\HintException($entry);
+			$l = \OC::$server->getL10N('lib');
+			throw new \OC\HintException(
+				$l->t('Database Error'),
+				$l->t('Please contact your system administrator.'),
+				0,
+				$e
+			);
 		}
 
 		if ($stmt->fetchColumn() === '0') {
@@ -59,7 +65,13 @@ class AdapterSqlite extends Adapter {
 			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
 			$entry .= 'Offending command was: ' . $query.'<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
-			throw new \OC\HintException($entry);
+			$l = \OC::$server->getL10N('lib');
+			throw new \OC\HintException(
+				$l->t('Database Error'),
+				$l->t('Please contact your system administrator.'),
+				0,
+				$e
+			);
 		}
 
 		return $result;
diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index 8d972411fe4..a85c0167e0b 100644
--- a/lib/private/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
@@ -158,10 +158,13 @@ class OC_DB_StatementWrapper {
 			OC_Log::write('core', $entry, OC_Log::FATAL);
 			OC_User::setUserId(null);
 
-			// send http status 503
-			header('HTTP/1.1 503 Service Temporarily Unavailable');
-			header('Status: 503 Service Temporarily Unavailable');
-			throw new \OC\HintException($entry);
+			$l = \OC::$server->getL10N('lib');
+			throw new \OC\HintException(
+				$l->t('Database Error'),
+				$l->t('Please contact your system administrator.'),
+				0,
+				$e
+			);
 		}
 	}
 
-- 
2.39.5