Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Do not display login dialog when using HTTP_AUTH

Fixes #11084
  • Loading branch information...
commit 90633ab8bcfd1b9f42ad8a1882f6b1b26716cec5 1 parent 6017aa5
@dregad dregad authored
Showing with 8 additions and 2 deletions.
  1. +8 −2 core/authentication_api.php
View
10 core/authentication_api.php
@@ -393,8 +393,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' );
Please sign in to comment.
Something went wrong with that request. Please try again.