[mantisbt-commits] mantisbt.git branch, master-1.2.x, updated. release-1.2.5-15-g2125512

[<gi...@ma...>]

The branch, master-1.2.x has been updated
       via  2125512b820da731c62db4f52240255ec1275a31 (commit)
      from  c70ff523cdfffbe4969890b85c42d58416cf305a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2125512b820da731c62db4f52240255ec1275a31
Author: Lapinkiller <lap...@ho...>
Date:   Thu May 26 19:02:33 2011 +0200

    Fix bug when user not in ldap
    
    Fixes: #12960 Email / Realname lookups against LDAP spew warning when account is not in LDAP
    
    Signed-off-by: Robert Munteanu <rob...@gm...>

-----------------------------------------------------------------------

Summary of changes:
 core/ldap_api.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------

commit 2125512b820da731c62db4f52240255ec1275a31
Author: Lapinkiller <lap...@ho...>
Date:   Thu May 26 19:02:33 2011 +0200

    Fix bug when user not in ldap
    
    Fixes: #12960 Email / Realname lookups against LDAP spew warning when account is not in LDAP
    
    Signed-off-by: Robert Munteanu <rob...@gm...>

diff --git a/core/ldap_api.php b/core/ldap_api.php
index 7f9e012..9b605c0 100644
--- a/core/ldap_api.php
+++ b/core/ldap_api.php
@@ -262,7 +262,7 @@ function ldap_get_field_from_username( $p_username, $p_field ) {
 	}
 
 	# Make sure the requested field exists
-	if( array_key_exists( $p_field, $t_info[0] ) ) {
+	if( is_array($t_info[0]) && array_key_exists( $p_field, $t_info[0] ) ) {
 		$t_value = $t_info[0][$p_field][0];
 		log_event( LOG_LDAP, "Found value '{$t_value}' for field '{$p_field}'." );
 	} else {

-----------------------------------------------------------------------


--
Mantis Bug Tracker