Merge branch 'openid-plugin' into 'nightly'

OpenID plugin: 'openid_only' should be 'openidonly'

To match everywhere else.

See merge request !72
This commit is contained in:
mmn 2016-01-05 23:28:28 +00:00
commit 2c5460eb0e

View File

@ -414,7 +414,7 @@ class OpenIDPlugin extends Plugin
*/ */
function onRedirectToLogin($action, $user) function onRedirectToLogin($action, $user)
{ {
if (common_config('site', 'openid_only') || (!empty($user) && User_openid::hasOpenID($user->id))) { if (common_config('site', 'openidonly') || (!empty($user) && User_openid::hasOpenID($user->id))) {
common_redirect(common_local_url('openidlogin'), 303); common_redirect(common_local_url('openidlogin'), 303);
} }
return true; return true;