diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-05 10:22:24 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-05 10:22:24 +0000 |
| commit | a5704a0b01b2f549aad0c1722ae3b136a9c55f1e (patch) | |
| tree | 44092e3287dc4f91d494073f541675f7f4475412 /phpBB/includes/functions_privmsgs.php | |
| parent | eee1dedc13627283dfc1cfc5aa00f769fa061df7 (diff) | |
| download | forums-a5704a0b01b2f549aad0c1722ae3b136a9c55f1e.tar forums-a5704a0b01b2f549aad0c1722ae3b136a9c55f1e.tar.gz forums-a5704a0b01b2f549aad0c1722ae3b136a9c55f1e.tar.bz2 forums-a5704a0b01b2f549aad0c1722ae3b136a9c55f1e.tar.xz forums-a5704a0b01b2f549aad0c1722ae3b136a9c55f1e.zip | |
Better support for nested transactions...
git-svn-id: file:///svn/phpbb/trunk@7469 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 5ff4324904..7f2e3e4c12 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1356,6 +1356,8 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) } } + $db->sql_transaction('begin'); + $sql = ''; switch ($mode) @@ -1432,8 +1434,6 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) if ($mode != 'edit') { - $db->sql_transaction('begin'); - if ($sql) { $db->sql_query($sql); @@ -1474,8 +1474,6 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) 'pm_forwarded' => ($mode == 'forward') ? 1 : 0)) ); } - - $db->sql_transaction('commit'); } // Set user last post time @@ -1487,8 +1485,6 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) $db->sql_query($sql); } - $db->sql_transaction('begin'); - // Submit Attachments if (!empty($data['attachment_data']) && $data['msg_id'] && in_array($mode, array('post', 'reply', 'quote', 'quotepost', 'edit', 'forward'))) { @@ -1568,8 +1564,6 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) } } - $db->sql_transaction('commit'); - // Delete draft if post was loaded... $draft_id = request_var('draft_loaded', 0); if ($draft_id) @@ -1580,6 +1574,8 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) $db->sql_query($sql); } + $db->sql_transaction('commit'); + // Send Notifications if ($mode != 'edit') { |