Applied patch for LDAP version (#1484552)

git-svn-id: https://svn.roundcube.net/trunk@787 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 1 deletions

diff --git a/roundcubemail/program/include/rcube_ldap.inc b/roundcubemail/program/include/rcube_ldap.inc
index e6a15d9dc..3de018426 100644
--- a/roundcubemail/program/include/rcube_ldap.inc
+++ b/roundcubemail/program/include/rcube_ldap.inc
@@ -86,11 +86,14 @@ class rcube_ldap
     if (!is_array($this->prop['hosts']))
       $this->prop['hosts'] = array($this->prop['hosts']);
 
+    if (empty($this->prop['ldap_version']))
+      $this->prop['ldap_version'] = 3;
+
     foreach ($this->prop['hosts'] as $host)
     {
       if ($lc = @ldap_connect($host, $this->prop['port']))
       {
-        ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['port']);
+        ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['ldap_version']);
         $this->prop['host'] = $host;
         $this->conn = $lc;
         break;