diff options
| author | Guy Brand <gb@unistra.fr> | 2013-11-18 20:48:03 +0100 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2013-11-18 20:48:03 +0100 |
| commit | 9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764 (patch) | |
| tree | d87417a2562e14e40f21012a9e1ede2d159239c5 /lib/plugins/authldap/auth.php | |
| parent | 0f71b9e8c36a27b7e476b43879f1cf9636a9958e (diff) | |
| parent | 14b3007921f7b66fc9e3621b861a3c83e7e9093c (diff) | |
| download | rpg-9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764.tar.gz rpg-9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/plugins/authldap/auth.php')
| -rw-r--r-- | lib/plugins/authldap/auth.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php index de1332282..31e2c5135 100644 --- a/lib/plugins/authldap/auth.php +++ b/lib/plugins/authldap/auth.php @@ -166,7 +166,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { // be accessible anonymously, so we try to rebind the current user here list($loginuser, $loginsticky, $loginpass) = auth_getCookie(); if($loginuser && $loginpass) { - $loginpass = PMA_blowfish_decrypt($loginpass, auth_cookiesalt(!$loginsticky)); + $loginpass = auth_decrypt($loginpass, auth_cookiesalt(!$loginsticky, true)); $this->checkPass($loginuser, $loginpass); } } |