3 files changed, 26 insertions, 50 deletions

diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 2ada0ac1..38124b0d 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -25,23 +25,6 @@
  */
 class group_Core {
   /**
-   * Create a new group.
-   *
-   * @param string  $name
-   * @return Group_Definition the group object
-   */
-  static function create($name) {
-    $group = ORM::factory("group")->where("name", "=", $name)->find();
-    if ($group->loaded()) {
-      throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
-    }
-
-    $group->name = $name;
-    $group->save();
-    return $group;
-  }
-
-  /**
    * The group of all possible visitors.  This includes the guest user.
    *
    * @return Group_Definition the group object
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index e092aecc..3561021f 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -36,32 +36,6 @@ class user_Core {
   }
 
   /**
-   * Create a new user.
-   *
-   * @param string  $name
-   * @param string  $full_name
-   * @param string  $password
-   * @return User_Model
-   */
-  static function create($name, $full_name, $password) {
-    $user = ORM::factory("user")->where("name", "=", $name)->find();
-    if ($user->loaded()) {
-      throw new Exception("@todo USER_ALREADY_EXISTS $name");
-    }
-
-    $user->name = $name;
-    $user->full_name = $full_name;
-    $user->password = $password;
-
-    // Required groups
-    $user->add(group::everybody());
-    $user->add(group::registered_users());
-
-    $user->save();
-    return $user;
-  }
-
-  /**
    * Is the password provided correct?
    *
    * @param user User Model
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 38f8020b..f2d131ae 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -85,21 +85,40 @@ class user_installer {
                  UNIQUE KEY(`user_id`, `group_id`))
                DEFAULT CHARSET=utf8;");
 
-    $everybody = group::create("Everybody");
+    $everybody = ORM::factory("group");
+    $everybody->name = "Everybody";
     $everybody->special = true;
     $everybody->save();
 
-    $registered = group::create("Registered Users");
+    $registered = ORM::factory("group");
+    $registered->name = "Registered Users";
     $registered->special = true;
     $registered->save();
 
-    $guest = user::create("guest", "Guest User", "");
-    $guest->guest = true;
-    $guest->remove($registered);
+    // Avoid ORM to sidestep validation.
+    db::build()->insert(
+      "users",
+      array("name" => "guest",
+            "full_name" => "Guest User",
+            "password" => "",
+            "guest" => true))
+      ->execute();
+
+    $guest = ORM::factory("user")->where("id", "=", 1)->find();
+    $guest->add($everybody);
     $guest->save();
 
-    $admin = user::create("admin", "Gallery Administrator", "admin");
-    $admin->admin = true;
+    db::build()->insert(
+      "users",
+      array("name" => "admin",
+            "full_name" => "Gallery Administrator",
+            "password" => "admin",
+            "admin" => true))
+      ->execute();
+
+    $admin = ORM::factory("user")->where("id", "=", 2)->find();
+    $admin->add($everybody);
+    $admin->add($registered);
     $admin->save();
 
     $root = ORM::factory("item", 1);