diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-03-24 09:59:17 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-03-24 09:59:17 +0000 |
| commit | 23cbbcb1b2687a263c5cea6b9bc30524a3554934 (patch) | |
| tree | 5679c59e2db71d265d5f3f09b100269cf81df8d6 /includes/database | |
| parent | 8258959e940d8a73da69f7be7e517588f46531a5 (diff) | |
| download | brdo-23cbbcb1b2687a263c5cea6b9bc30524a3554934.tar.gz brdo-23cbbcb1b2687a263c5cea6b9bc30524a3554934.tar.bz2 | |
- Patch #748982 by mikeryan: allow Database logging_callback() to be a class method.
Diffstat (limited to 'includes/database')
| -rw-r--r-- | includes/database/database.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index a4c996a0e..73dbfe78f 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -1017,7 +1017,7 @@ abstract class DatabaseConnection extends PDO { else { if (isset($logging_callback)) { // Log the failed rollback. - $logging_callback('database', 'Explicit rollback failed: not supported on active connection.', array(), $logging['error_severity']); + call_user_func($logging_callback, 'database', 'Explicit rollback failed: not supported on active connection.', array(), $logging['error_severity']); } // It would be nice to throw an exception here if logging failed, @@ -1028,7 +1028,7 @@ abstract class DatabaseConnection extends PDO { // Play back the logged errors to the specified logging callback post- // rollback. foreach ($rollback_logs as $log_item) { - $logging_callback($log_item['type'], $log_item['message'], $log_item['variables'], $log_item['severity'], $log_item['link']); + call_user_func($logging_callback, $log_item['type'], $log_item['message'], $log_item['variables'], $log_item['severity'], $log_item['link']); } } } |