Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing

2010-03-23 12:13:32 -07:00
parent fcdbf421ab 44caa3a93f
commit 7277b59734
5 changed files with 15 additions and 5 deletions
--- a/lib/util.php
+++ b/lib/util.php
@@ -1529,7 +1529,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