Branch 'kolab-webadmin-3.0' - lib/Auth

[Jeroen van Meeuwen]

 lib/Auth/LDAP.php |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4b665556b7dc6d41696f994db63a77052fba2bfd
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Nov 28 23:43:31 2012 +0000

    Correct handling the return value of Auth::LDAP::domain_info(), that can also be false

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index 1f94610..0371834 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -139,7 +139,8 @@ class LDAP extends Net_LDAP3 {
     {
         // Apply some routines for access control to this function here.
         if (!empty($parent_domain)) {
-            if ($this->domain_info($parent_domain)->count() < 1) {
+            $domain_info = $this->domain_info($parent_domain);
+            if ($domain_info === false) {
                 $this->_domain_add_new($parent_domain, $prepopulate);
             }