do not output DB information, and do not set header

diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index 86f867d099f7a1110b43038aaaa923025de9d1d6..58b3514b9225a94a3fb2aed2cf1b46c98370d88b 100644 (file)
--- 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 39e2491ed08a27d0186fd49703a6566e88ca5a21..c5dfa85aaac0d490657a625937b74fe14d1e05f5 100644 (file)
--- 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 8d972411fe4f485bb858242aa3b6e69d8d047f17..a85c0167e0b56a431a5c6802b500197720546dff 100644 (file)
--- 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
+                       );
                }
        }