Merge branch '5.2' into 5

silverstripe · Mar 9, 2024 · 8f48e9b · 8f48e9b
2 parents 5ab9ded + c36df38
commit 8f48e9b
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/Security/Member.php b/src/Security/Member.php
@@ -521,13 +521,11 @@ public function encryptWithUserSettings($string)
 
         // If the algorithm or salt is not available, it means we are operating
         // on legacy account with unhashed password. Do not hash the string.
-        if (!$this->PasswordEncryption) {
+        if (!$this->PasswordEncryption || !$this->Salt) {
             return $string;
         }
 
-        // We assume we have PasswordEncryption and Salt available here.
         $e = PasswordEncryptor::create_for_algorithm($this->PasswordEncryption);
-
         return $e->encrypt($string, $this->Salt);
     }