6 files changed, 26 insertions, 6 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index a3633b52..41be6c03 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -21,6 +21,8 @@ class Admin_Users_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->page_title = t("Users and groups");
+    $view->page_type = "collection";
+    $view->page_subtype = "admin_users";
     $view->content = new View("admin_users.html");
 
     // @todo: add this as a config option
@@ -29,6 +31,12 @@ class Admin_Users_Controller extends Admin_Controller {
     $builder = db::build();
     $user_count = $builder->from("users")->count_records();
 
+    // Pagination info
+    $view->page = $page;
+    $view->page_size = $page_size;
+    $view->children_count = $user_count;
+    $view->max_pages = ceil($view->children_count / $view->page_size);
+
     $view->content->pager = new Pagination();
     $view->content->pager->initialize(
       array("query_string" => "page",
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 4e93d5ce..cd46bbed 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -105,7 +105,7 @@ class Password_Controller extends Controller {
     if (!empty($hash)) {
       $hidden->value($hash);
     }
-    $minimum_length = module::get_var("user", "mininum_password_length", 5);
+    $minimum_length = module::get_var("user", "minimum_password_length", 5);
     $input_password = $group->password("password")->label(t("Password"))->id("g-password")
       ->rules($minimum_length ? "required|length[$minimum_length, 40]" : "length[40]");
     $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index b889af49..9b582773 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -24,6 +24,7 @@ class user_installer {
 
   static function install() {
     IdentityProvider::change_provider("user");
+    // Set the latest version in initialize() below
   }
 
   static function upgrade($version) {
@@ -44,6 +45,13 @@ class user_installer {
         ->execute();
       module::set_version("user", $version = 3);
     }
+
+    if ($version == 3) {
+      $password_length = module::get_var("user", "mininum_password_length", 5);
+      module::set_var("user", "minimum_password_length", $password_length);
+      module::clear_var("user", "mininum_password_length");
+      module::set_version("user", $version = 4);
+    }
   }
 
   static function uninstall() {
@@ -129,7 +137,7 @@ class user_installer {
     access::allow($registered, "view", $root);
     access::allow($registered, "view_full", $root);
 
-    module::set_var("user", "mininum_password_length", 5);
-    module::set_version("user", 3);
+    module::set_var("user", "minimum_password_length", 5);
+    module::set_version("user", 4);
   }
 }
 \ No newline at end of file
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 145738ca..a8a3a0e7 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -147,7 +147,7 @@ class User_Model_Core extends ORM implements User_Definition {
     }
 
     if (!$this->loaded() || isset($this->password_length)) {
-      $minimum_length = module::get_var("user", "mininum_password_length", 5);
+      $minimum_length = module::get_var("user", "minimum_password_length", 5);
       if ($this->password_length < $minimum_length) {
         $v->add_error("password", "min_length");
       }
diff --git a/modules/user/module.info b/modules/user/module.info
index 185a3e3a..503bcd0d 100644
--- a/modules/user/module.info
+++ b/modules/user/module.info
@@ -1,4 +1,8 @@
 name = "Users and Groups"
 description = "Gallery 3 user and group management"
-version = 3
+version = 4
 
+author_name = "Gallery Team"
+author_url = "http://codex.gallery2.org/Gallery:Team"
+info_url = "http://codex.gallery2.org/Gallery3:Modules:user"
+discuss_url = "http://gallery.menalto.com/forum_module_user"
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index a7bd6b27..033c9dae 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -110,7 +110,7 @@
         </table>
 
         <div class="g-paginator">
-          <?= $pager ?>
+          <?= $theme->paginator() ?>
         </div>
 
       </div>