diff options
| author | Brion Vibber <brion@pobox.com> | 2010-12-06 12:39:09 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-12-06 12:39:09 -0800 |
| commit | 76f3dc32e0e1aa933931b7cc59030ae20bb4f89b (patch) | |
| tree | 8ad6d443ac6a46ccd50b9fab00c3a095473c89de /lib | |
| parent | b4fc54c308936477706acb5cc3c4acae4c3f3a4d (diff) | |
Added User::singleUserNickname() as (temporary?) fallback for single-user lookup as a workaround for site setup of 1user sites. We found that an external tool attempting to spin up StatusNet and then register the user would fail because StatusNet's router setup dies on being unable to find its single-user account, since the nickname is needed in setting up routing entries. This tweak will let it survive, using the configured setting as a fallback if it can't actually find the user account.
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 7272a9690..2a908c7e0 100644 --- a/lib/router.php +++ b/lib/router.php @@ -787,8 +787,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 d50fa2081..a1ea1f24d 100644 --- a/lib/util.php +++ b/lib/util.php @@ -975,9 +975,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)); |