maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

add domainid to result-list of Emails.get(); fix typo in EmailAccounts.add(); enhance debugging in Database-class

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-12 15:52:34 +01:00
parent 54deec87d0
commit a7523bbdea
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/classes/database/class.Database.php
View File

@@ -372,17 +372,17 @@ class Database {
@fwrite($errlog, "|TRACE\n".$error_trace."\n");
@fclose($errlog);
if (empty($sql['debug'])) {
$error_trace = '';
} elseif (!is_null($stmt)) {
$error_trace .= "<br><br>".$stmt->queryString;
}
if ($showerror && $json_response) {
throw new Exception($error_message, 500);
throw new Exception($error_message.($sql['debug'] ? "\n\n".$error_trace : ''), 500);
}
if ($showerror) {
if (empty($sql['debug'])) {
$error_trace = '';
} elseif (!is_null($stmt)) {
$error_trace .= "<br><br>".$stmt->queryString;
}
// fallback
$theme = 'Sparkle';