From e1bf010d89c4ef2023f204834c468793d866483c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 31 Jan 2010 20:50:52 -0800
Subject: Force all non-guest users to have an email address since that's
 required in model validation.  Without this, any save on a user without email
 will fail which means that you can't log in.

Bump user module to version 3.
---
 modules/user/helpers/user_installer.php | 16 ++++++++++++++--
 modules/user/module.info                |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 1d49998d..729f087a 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -29,9 +29,21 @@ class user_installer {
   static function upgrade($version) {
     if ($version == 1) {
       module::set_var("user", "mininum_password_length", 5);
-
       module::set_version("user", $version = 2);
     }
+
+    if ($version == 2) {
+      db::build()
+        ->update("users")
+        ->set("email", "unknown@unknown.com")
+        ->where("guest", "=", 0)
+        ->and_open()
+        ->where("email", "IS", null)
+        ->or_where("email", "=", "")
+        ->close()
+        ->execute();
+      module::set_version("user", $version = 3);
+    }
   }
 
   static function uninstall() {
@@ -117,7 +129,7 @@ class user_installer {
     access::allow($registered, "view", $root);
     access::allow($registered, "view_full", $root);
 
-    module::set_version("user", 2);
     module::set_var("user", "mininum_password_length", 5);
+    module::set_version("user", 3);
   }
 }
\ No newline at end of file
diff --git a/modules/user/module.info b/modules/user/module.info
index d1e02382..185a3e3a 100644
--- a/modules/user/module.info
+++ b/modules/user/module.info
@@ -1,4 +1,4 @@
 name = "Users and Groups"
 description = "Gallery 3 user and group management"
-version = 2
+version = 3
 
-- 
cgit v1.2.3