summaryrefslogtreecommitdiff
path: root/classes/Conversation.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-24 14:11:01 -0700
committerBrion Vibber <brion@pobox.com>2010-03-24 14:11:01 -0700
commitc3ceaa893fa878d531b0af05a3a8ed367177848c (patch)
tree69373ab2bbdb6dd516487752efd8889eeed8b31e /classes/Conversation.php
parent886e28aaa9e4e9a524d5b1a933a2d2a13994aec9 (diff)
parentecb009bcf5a6893b90d153be18c423dd7377796d (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
Diffstat (limited to 'classes/Conversation.php')
-rwxr-xr-xclasses/Conversation.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/Conversation.php b/classes/Conversation.php
index ea8bd87b5..f540004ef 100755
--- a/classes/Conversation.php
+++ b/classes/Conversation.php
@@ -63,7 +63,8 @@ class Conversation extends Memcached_DataObject
}
$orig = clone($conv);
- $orig->uri = common_local_url('conversation', array('id' => $id));
+ $orig->uri = common_local_url('conversation', array('id' => $id),
+ null, null, false);
$result = $orig->update($conv);
if (empty($result)) {