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

Conflicts:
	classes/User.php

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/util.php b/lib/util.php
index 26b20b5e1..da36121ff 100644
--- 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));