upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

eliminate OC_Template::printErrorPage in database classes, fixes #12182

Browse source
This commit is contained in:
Arthur Schiwon 2014-11-14 15:48:55 +01:00
parent 0f3c5d8541
commit 7ed678b04d
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/private/db/adapter.php
View file

@ -43,6 +43,7 @@ class Adapter {
* insert the @input values when they do not exist yet
* @param string $table name
* @param array $input key->value pair, key has to be sanitized properly
* @throws \OC\HintException
* @return int count of inserted rows
*/
public function insertIfNotExist($table, $input) {
@ -71,7 +72,7 @@ class Adapter {
$entry .= 'Offending command was: ' . $query.'<br />';
\OC_Log::write('core', $entry, \OC_Log::FATAL);
error_log('DB error: ' . $entry);
\OC_Template::printErrorPage( $entry );
throw new \OC\HintException($entry);
}
}
}

4
lib/private/db/adaptersqlite.php
View file

@ -42,7 +42,7 @@ class AdapterSqlite extends Adapter {
$entry .= 'Offending command was: ' . $query . '<br />';
\OC_Log::write('core', $entry, \OC_Log::FATAL);
error_log('DB error: '.$entry);
\OC_Template::printErrorPage( $entry );
throw new \OC\HintException($entry);
}
if ($stmt->fetchColumn() === '0') {
@ -61,7 +61,7 @@ class AdapterSqlite extends Adapter {
$entry .= 'Offending command was: ' . $query.'<br />';
\OC_Log::write('core', $entry, \OC_Log::FATAL);
error_log('DB error: ' . $entry);
\OC_Template::printErrorPage( $entry );
throw new \OC\HintException($entry);
}
return $result;

7
lib/private/db/statementwrapper.php
View file

@ -64,7 +64,7 @@ class OC_DB_StatementWrapper {
} else {
$result = $this->statement->execute();
}
if ($result === false) {
return false;
}
@ -161,11 +161,10 @@ class OC_DB_StatementWrapper {
// send http status 503
header('HTTP/1.1 503 Service Temporarily Unavailable');
header('Status: 503 Service Temporarily Unavailable');
OC_Template::printErrorPage('Failed to connect to database');
die ($entry);
throw new \OC\HintException($entry);
}
}
/**
* provide an alias for fetch
*