diff options
| author | Evan Prodromou <evan@status.net> | 2010-12-06 15:52:03 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-12-06 15:52:03 -0500 |
| commit | da8b268e06f4a6217c2bbb4918888001f8e7e4cd (patch) | |
| tree | ddf92bbbf01ea46a49258a1ea58b9f24df5ab3ab /lib | |
| parent | 0c0418bdfbb40f7fae02cca4cf1a09746bae8b3a (diff) | |
| parent | 2617c40e048aee071b72b4b5f664fab36e6c632d (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/router.php | 3 | ||||
| -rw-r--r-- | lib/util.php | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/router.php b/lib/router.php index a0ea996ec..8670519ff 100644 --- a/lib/router.php +++ b/lib/router.php @@ -798,8 +798,7 @@ class Router if (common_config('singleuser', 'enabled')) { - $user = User::singleUser(); - $nickname = $user->nickname; + $nickname = User::singleUserNickname(); foreach (array('subscriptions', 'subscribers', 'all', 'foaf', 'xrds', 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)); |