diff options
| author | Thomas Arendsen Hein <thomas@intevation.de> | 2009-03-13 11:45:32 (GMT) |
|---|---|---|
| committer | Thomas Arendsen Hein <thomas@intevation.de> | 2009-03-13 11:45:32 (GMT) |
| commit | 56bb24fc53bf8fca444ff478d270b5ede5dde89b (patch) | |
| tree | 05a02c8027a4e7b30642183c627e9fc3e38ff826 | |
| parent | a0fd99ccb5aab204c76b971917d9e2a42ab64aec (diff) | |
| download | kolab-webadmin-2.2-feature-suc.tar.gz | |
Port "Fix undefined variable $conn in ldap.class.php" form HEAD:2.2.12.2-feature-suc
cvs up -j1.1 -j1.2 kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php.in
cvs up -j1.110 -j1.111 kolab-webadmin/kolab-webadmin/ChangeLog
and update release notes
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | php/admin/include/ldap.class.php.in | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2009-03-07 Mathieu Parent <math.parent@gmail.com> + + * php/admin/include/ldap.class.php.in: Fix undefined variable $conn + 2009-02-16 Richard Bos <richard@radoeka.nl> * php/admin/templates/settings.tpl: improved layout, diff --git a/php/admin/include/ldap.class.php.in b/php/admin/include/ldap.class.php.in index da125dd..97530ae 100644 --- a/php/admin/include/ldap.class.php.in +++ b/php/admin/include/ldap.class.php.in @@ -334,7 +334,7 @@ class KolabLDAP { $res = ldap_search( $this->connection, $mybase, $filter, array('member') ); if( !$res ) { array_push($errors, _("LDAP Error: Can't read maintainers group: ") - .ldap_error($conn) ); + .ldap_error($this->connection) ); return array(); } $entries = ldap_get_entries( $this->connection, $res ); |