Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index de7540705..4a06c9258 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -129,6 +129,8 @@ class Notice extends Memcached_DataObject
             $notice->is_local = $is_local;
         }
 
+		$notice->query('BEGIN');
+
         $notice->reply_to = $reply_to;
         $notice->created = common_sql_now();
         $notice->content = common_shorten_links($content);
@@ -160,6 +162,9 @@ class Notice extends Memcached_DataObject
         $notice->saveTags();
         $notice->saveGroups();
 
+        $notice->addToInboxes();
+		$notice->query('COMMIT');
+
         # Clear the cache for subscribed users, so they'll update at next request
         # XXX: someone clever could prepend instead of clearing the cache
 
@@ -167,7 +172,6 @@ class Notice extends Memcached_DataObject
             $notice->blowCaches();
         }
 
-        $notice->addToInboxes();
         return $notice;
     }