diff options
| author | foobar <sniper@php.net> | 2000-12-04 17:26:11 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2000-12-04 17:26:11 +0000 |
| commit | c0446845b9928999b76daf039606e19cfa4ceb4a (patch) | |
| tree | f872002a5cdf028cfd8d4771bb423cf4a2b5bbf8 /ext | |
| parent | 326dcb9e79d6871c7391d46c19230d28f492c88a (diff) | |
| download | php-git-c0446845b9928999b76daf039606e19cfa4ceb4a.tar.gz | |
Merge changes from head branch.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/ldap/ldap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 989b2bce6e..914def184a 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -851,11 +851,13 @@ PHP_FUNCTION(ldap_get_entries) if (ldap_result == NULL) RETURN_FALSE; num_entries = ldap_count_entries(ldap, ldap_result); - if (num_entries == 0) RETURN_FALSE; array_init(return_value); - + add_assoc_long(return_value, "count", num_entries); + + if (num_entries == 0) return; num_entries = 0; + ldap_result_entry = ldap_first_entry(ldap, ldap_result); if (ldap_result_entry == NULL) RETURN_FALSE; |