Merge branch '0.9.x' into 1.0.x

Conflicts:
	README
	lib/default.php
This commit is contained in:
Brion Vibber
2010-10-18 12:17:11 -07:00
15 changed files with 371 additions and 83 deletions

View File

@@ -257,7 +257,7 @@ class OpenIDAdminPanelForm extends AdminForm
$this->out->checkbox(
'openidonly', _m('Enable OpenID-only mode'),
(bool) $this->value('openidonly', 'site'),
_m('Require all users to login via OpenID. WARNING: disables password authentication for all users!'),
_m('Require all users to login via OpenID. Warning: disables password authentication for all users!'),
'true'
);
$this->unli();