Merge branch 'MDL-58050-32-msgtrans' of git://github.com/mudrd8mz/moodle into MOODLE_32_STABLE

This commit is contained in:
Dan Poltawski
2017-03-20 13:19:26 +00:00
2 changed files with 5 additions and 1 deletions
+2 -1
View File
@@ -314,6 +314,7 @@ class api {
// This user has no conversations so we can return early here.
if (empty($conversationrecords)) {
$transaction->allow_commit();
return [];
}
@@ -440,7 +441,7 @@ class api {
$unreadcounts = $DB->get_records_sql($unreadcountssql, [$userid]);
// We can close off the transaction now.
$DB->commit_delegated_transaction($transaction);
$transaction->allow_commit();
// Now we need to order the messages back into the same order of the conversations.
$orderedconvosigs = array_keys($conversationrecords);