Manually merged a conflict after pulling from upstream.

1 files changed, 10 insertions, 2 deletions

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