diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-03-26 18:46:06 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-03-26 18:46:06 +0000 |
| commit | a7d001f7d18c738875fc846dbb719c4bbdf9272b (patch) | |
| tree | 118aae889845f8c2c555af960577c1812b0cd6f7 /includes | |
| parent | d428fe37b91d9fb04b62d19d8ce04da32a1ac96c (diff) | |
| download | brdo-a7d001f7d18c738875fc846dbb719c4bbdf9272b.tar.gz brdo-a7d001f7d18c738875fc846dbb719c4bbdf9272b.tar.bz2 | |
- Patch #669794 by andypost: use savepoints for nested transactions.
Diffstat (limited to 'includes')
| -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 7f3617b5a..64b22dc58 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -984,12 +984,12 @@ abstract class DatabaseConnection extends PDO { $logging_callback = $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']); // Play back the logged errors to the specified logging callback post- // rollback. foreach ($this->rollbackLogs 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']); } // Reset the error logs. |