summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-23 09:50:01 -0700
committerBrion Vibber <brion@pobox.com>2010-03-23 09:56:05 -0700
commit80b16c8499d0cfdb4deb442ba18345befed4e29d (patch)
tree89d3715f60c932f501557ba28e954a256dcf1003
parent5697e4edb0fc4bb1d4c9365100501e795b2553de (diff)
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.
-rwxr-xr-xclasses/Conversation.php3
-rw-r--r--lib/util.php3
2 files changed, 4 insertions, 2 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)) {
diff --git a/lib/util.php b/lib/util.php
index 44ccc0def..3d4ed087f 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -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