Merge branch 'master_MDL-38102' of github.com:totara/moodle

hyokwang-ahn · May 7, 2013 · 5946813 · 5946813
2 parents b6009c5 + d7f6936
commit 5946813
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -4485,7 +4485,7 @@ function hash_internal_user_password($password, $fasthash = false) {
 
     $generatedhash = password_hash($password, PASSWORD_DEFAULT, $options);
 
-    if ($generatedhash === false) {
+    if ($generatedhash === false || $generatedhash === null) {
         throw new moodle_exception('Failed to generate password hash.');
     }