Merge branch '3.5.5' into 3.6.2

This commit is contained in:
Daniel Hensby 2017-09-20 16:34:42 +01:00
commit 32c74a86e2
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -266,7 +266,8 @@ class ContentController extends Controller {
* all available log-in forms (also OpenID...)
*/
public function LoginForm() {
return MemberAuthenticator::get_login_form($this);
$authenticator = Authenticator::get_default_authenticator();
return $authenticator::get_login_form($this);
}
public function SilverStripeNavigator() {