Apply changes from trunk to 0.1-stable

1 files changed, 8 insertions, 8 deletions

diff --git a/program/include/rcube_ldap.inc b/program/include/rcube_ldap.inc
index 29e7faa6b..969101b2a 100644
--- a/program/include/rcube_ldap.inc
+++ b/program/include/rcube_ldap.inc
@@ -119,20 +119,20 @@ class rcube_ldap
    */
   function bind($dn, $pass)
   {
-    if (!$this->conn)
+    if (!$this->conn) {
       return false;
+    }
     
-    if (@ldap_bind($this->conn, $dn, $pass))
+    if (ldap_bind($this->conn, $dn, $pass)) {
       return true;
-    else
-    {
-      raise_error(array(
+    }
+
+    raise_error(array(
         'code' => ldap_errno($this->conn),
         'type' => 'ldap',
         'message' => "Bind failed for dn=$dn: ".ldap_error($this->conn)),
-      true);
-    }
-    
+        true);
+
     return false;
   }