From a7d001f7d18c738875fc846dbb719c4bbdf9272b Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 26 Mar 2010 18:46:06 +0000 Subject: - Patch #669794 by andypost: use savepoints for nested transactions. --- includes/database/database.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'includes/database') 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. -- cgit v1.2.3