Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override.

This was being triggered by welcomebot messages created at account creation time, then propagated through replies.
This commit is contained in:
Brion Vibber 2010-03-23 09:50:01 -07:00
parent 5697e4edb0
commit 80b16c8499
2 changed files with 4 additions and 2 deletions

View File

@ -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)) {

View File

@ -1521,7 +1521,8 @@ function common_user_uri(&$user)
function common_notice_uri(&$notice)
{
return common_local_url('shownotice',
array('notice' => $notice->id));
array('notice' => $notice->id),
null, null, false);
}
// 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits