summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/Notice.php6
-rw-r--r--classes/User.php2
2 files changed, 6 insertions, 2 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;
}
diff --git a/classes/User.php b/classes/User.php
index 5f4fb9b6f..b1bae8835 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -403,7 +403,7 @@ class User extends Memcached_DataObject
'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' .
'WHERE notice_inbox.user_id = %d ';
# NOTE: we override ORDER
- $order = 'ORDER BY notice_inbox.created DESC, notice_inbox.notice_id DESC ';
+ $order = null;
}
return Notice::getStream(sprintf($qry, $this->id),
'user:notices_with_friends:' . $this->id,