Fix password_verify() logic, retry with crypt() on failure.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@4465 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 4 insertions, 2 deletions

diff --git a/pmwiki.php b/pmwiki.php
index c2a33ef8..2a2c8872 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -855,8 +855,10 @@ function pmcrypt($str, $salt=null) {
   SDV($PmCryptAlgo, PASSWORD_DEFAULT);
   if ($salt && preg_match('/^(-?@|\\*$)/',  $salt)) return false;
   if (!is_null($salt)) {
-//     if(function_exists('password_verify'))
-//       return password_verify($str, $salt);
+    if(function_exists('password_verify')) {
+      if(password_verify($str, $salt)) return $salt;
+      # else retry with crypt()
+    }
     return crypt($str, $salt);
   }