Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x

2010-03-24 14:11:01 -07:00
parent 886e28aaa9 ecb009bcf5
commit c3ceaa893f
95 changed files with 4013 additions and 2152 deletions
--- a/lib/util.php
+++ b/lib/util.php
@@ -1520,7 +1520,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