Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts: classes/User.php
2010-12-06 12:44:19 -08:00
parent 89f5dd4c18 76f3dc32e0
commit 2617c40e04
3 changed files with 35 additions and 4 deletions
--- a/lib/util.php
+++ b/lib/util.php
@@ -1075,9 +1075,9 @@ function common_tag_link($tag)
    $canonical = common_canonical_tag($tag);
    if (common_config('singleuser', 'enabled')) {
        // regular TagAction isn't set up in 1user mode
-        $user = User::singleUser();
+        $nickname = User::singleUserNickname();
        $url = common_local_url('showstream',
-                                array('nickname' => $user->nickname,
+                                array('nickname' => $nickname,
                                      'tag' => $canonical));
    } else {
        $url = common_local_url('tag', array('tag' => $canonical));