diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 16:45:42 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 16:45:42 -0400 |
| commit | 59beff6b46fb7693812558eaf728ca3709e4b066 (patch) | |
| tree | 3a178e7e1a68ce1390d4e6178000f744b38e68b6 /actions/showstream.php | |
| parent | bacef32aaca791ec5e25bd951094baec0b41df28 (diff) | |
Revert "Added configuration option to only allow OpenID logins."
This reverts commit 14b46e2183f10359cc53d597913a878f53e23719.
This functionality will need to be rewritten to work with the new
OpenIDPlugin.
Conflicts:
index.php
lib/logingroupnav.php
Diffstat (limited to 'actions/showstream.php')
| -rw-r--r-- | actions/showstream.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index 3f603d64f..cd5d4bb70 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -358,9 +358,7 @@ class ShowstreamAction extends ProfileAction } } else { - $message .= sprintf(_('Why not [register an account](%%%%action.%s%%%%) and then nudge %s or post a notice to his or her attention.'), - (!common_config('site','openidonly')) ? 'register' : 'openidlogin', - $this->user->nickname); + $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname); } $this->elementStart('div', 'guide'); @@ -389,10 +387,8 @@ class ShowstreamAction extends ProfileAction if (!(common_config('site','closed') || common_config('site','inviteonly'))) { $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' . - '[Join now](%%%%action.%s%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), - $this->user->nickname, - (!common_config('site','openidonly')) ? 'register' : 'openidlogin', - $this->user->nickname); + '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), + $this->user->nickname, $this->user->nickname); } else { $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [Laconica](http://laconi.ca/) tool. '), |