Merge branch 'master' of github.com:gallery/gallery3

1 files changed, 4 insertions, 0 deletions

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index d3ed92e8..faf08291 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -309,6 +309,10 @@ class g2_import_Core {
                                     // Just use the hashed password as an unpredictable
                                     // value here. The user will have to reset the password.
                                     $g2_user->getHashedPassword(), $g2_user->getEmail());
+      if (class_exists("User_Model") && $user instanceof User_Model) {
+        // This will work if G2's password is a PasswordHash password as well.
+        $user->hashed_password = $g2_user->getHashedPassword();
+      }
       $message = t("Created user: '%name'.", array("name" => $user->name));
     }