Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 plugins/password/drivers/pam.php

@@ -11,9 +11,10 @@
{
    function save($currpass, $newpass)
    {
        $user = $_SESSION['username'];
        $user  = $_SESSION['username'];
        $error = '';

        if (extension_loaded('pam')) {
        if (extension_loaded('pam') || extension_loaded('pam_auth')) {
            if (pam_auth($user, $currpass, $error, false)) {
                if (pam_chpass($user, $currpass, $newpass)) {
                    return PASSWORD_SUCCESS;