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

2 files changed, 6 insertions, 1 deletions

diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 347da649..1d97653a 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -61,9 +61,10 @@ class G2_Controller extends Controller {
     }
 
     $item = ORM::factory("item", $g2_map->g3_id);
-    if (!$item->loaded() || !access::can("view", $item)) {
+    if (!$item->loaded()) {
       throw new Kohana_404_Exception();
     }
+    access::required("view", $item);
 
 
     // Redirect the user to the new url
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));
     }