From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
plugins/password/drivers/ldap.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index def07a1..f773335 100644
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@@ -85,7 +85,7 @@
// Crypt new samba password
if ($smbpwattr && !($samba_pass = $this->hashPassword($passwd, 'samba'))) {
- return PASSWORD_CRYPT_ERROR;
+ return PASSWORD_CRYPT_ERROR;
}
// Writing new crypted password to LDAP
@@ -274,8 +274,8 @@
$cryptedPassword = hash('md4', rcube_charset_convert($passwordClear, RCMAIL_CHARSET, 'UTF-16LE'));
$cryptedPassword = strtoupper($cryptedPassword);
} else {
- /* Your PHP install does not have the hash() function */
- return false;
+ /* Your PHP install does not have the hash() function */
+ return false;
}
break;
--
Gitblit v1.9.1