Permalink
Browse files

Do not display login dialog when using HTTP_AUTH

Fixes #11084
  • Loading branch information...
1 parent be9f1de commit 4775bff79d4976707e156e18280fa9b83879450d @dregad dregad committed May 15, 2013
Showing with 8 additions and 2 deletions.
  1. +8 −2 core/authentication_api.php
@@ -359,8 +359,14 @@ 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' );
- if( LDAP == $t_configured_login_method ) {
- return ldap_authenticate( $p_user_id, $p_test_password );
+ switch( $t_configured_login_method ) {
+ case LDAP:
+ return ldap_authenticate( $p_user_id, $p_test_password );
+ break;
+
+ case HTTP_AUTH:
+ return true;
+ break;
}
$t_password = user_get_field( $p_user_id, 'password' );

0 comments on commit 4775bff

Please sign in to comment.