Permalink
Browse files

Revert "Do not display login dialog when using HTTP_AUTH"

This reverts commit 90633ab.
  • Loading branch information...
1 parent 90633ab commit 79b6ddaef1dbde00458be768b3b5dbfb47b22a65 @dregad dregad committed May 15, 2013
Showing with 2 additions and 8 deletions.
  1. +2 −8 core/authentication_api.php
@@ -393,14 +393,8 @@ function auth_get_password_max_size() {
function auth_does_password_match( $p_user_id, $p_test_password ) {
$t_configured_login_method = config_get( 'login_method' );
- switch( $t_configured_login_method ) {
- case LDAP:
- return ldap_authenticate( $p_user_id, $p_test_password );
- break;
-
- case HTTP_AUTH:
- return true;
- break;
+ if( LDAP == $t_configured_login_method ) {
+ return ldap_authenticate( $p_user_id, $p_test_password );
}
$t_password = user_get_field( $p_user_id, 'password' );

0 comments on commit 79b6dda

Please sign in to comment.