diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2010-02-02 13:41:50 -0800 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2010-02-02 13:41:50 -0800 |
| commit | 31aaf7555f51dd80cf1e97fd3c20a1c245cbf61b (patch) | |
| tree | 594ca1cebbe5b8b58b4c50cb3c88487574dba712 /modules/user | |
| parent | be5f38adea89bdb95be359aea3d97615b6b530a3 (diff) | |
| parent | 3c3671cff25f28e21a702b1f665a6baa282d045f (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/controllers/admin_users.php | 2 | ||||
| -rw-r--r-- | modules/user/helpers/user_installer.php | 16 | ||||
| -rw-r--r-- | modules/user/module.info | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index c11b0596..03d9858b 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -323,7 +323,7 @@ class Admin_Users_Controller extends Admin_Controller { return $form; } - private function _add_locale_dropdown(&$form, $user=null) { + private static function _add_locale_dropdown(&$form, $user=null) { $locales = locales::installed(); foreach ($locales as $locale => $display_name) { $locales[$locale] = SafeString::of_safe_html($display_name); 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 |