diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
| commit | 1147dc977422e827a201fa081abd07721231d072 (patch) | |
| tree | 203d47297c49545a67bbdd98cbe137b255a5d6d8 /lib/db.php | |
| parent | 88b91a7304f2de998f71a674f4f62e85f5b83e54 (diff) | |
| parent | 135680e50bf760d55a1bcaaaa02f959bde396c52 (diff) | |
| download | nextcloud-server-1147dc977422e827a201fa081abd07721231d072.tar.gz nextcloud-server-1147dc977422e827a201fa081abd07721231d072.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'lib/db.php')
| -rw-r--r-- | lib/db.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/db.php b/lib/db.php index e48eece1e50..48e0ec82da8 100644 --- a/lib/db.php +++ b/lib/db.php @@ -324,7 +324,7 @@ class OC_DB { if( PEAR::isError($result)) { $entry = 'DB Error: "'.$result->getMessage().'"<br />'; $entry .= 'Offending command was: '.htmlentities($query).'<br />'; - OC_Log::write('core', $entry,OC_Log::FATAL); + OC_Log::write('core', $entry, OC_Log::FATAL); error_log('DB error: '.$entry); die( $entry ); } @@ -334,7 +334,7 @@ class OC_DB { }catch(PDOException $e) { $entry = 'DB Error: "'.$e->getMessage().'"<br />'; $entry .= 'Offending command was: '.htmlentities($query).'<br />'; - OC_Log::write('core', $entry,OC_Log::FATAL); + OC_Log::write('core', $entry, OC_Log::FATAL); error_log('DB error: '.$entry); die( $entry ); } |