From f57ac32e233a41e48d7dddae61c6bf3030d9252d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 3 Nov 2009 19:19:24 -0800
Subject: [PATCH] Always show the update button, even if there is no default
 group. Also don't set the default group for the user if there has been no
 default user defined.

---
 modules/register/helpers/register.php          | 5 ++++-
 modules/register/views/admin_register.html.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/register/helpers/register.php b/modules/register/helpers/register.php
index 5ee9a8f3..09044c6d 100644
--- a/modules/register/helpers/register.php
+++ b/modules/register/helpers/register.php
@@ -80,7 +80,10 @@ class register_Core {
     $new_user->guest = false;
     $new_user->save();
 
-    identity::add_user_to_group($new_user, module::get_var("registration", "default_group"));
+    $default_group = module::get_var("registration", "default_group");
+    if (!empty($default_group)) {
+      identity::add_user_to_group($new_user, $default_group);
+    }
 
     $user->hash =  md5(rand());
     $user->state = 2;
diff --git a/modules/register/views/admin_register.html.php b/modules/register/views/admin_register.html.php
index 00d96d04..60110ac8 100755
--- a/modules/register/views/admin_register.html.php
+++ b/modules/register/views/admin_register.html.php
@@ -51,10 +51,10 @@
       <li>
         <?= form::dropdown(array("name" => "group"), $group_list, $form["group"]) ?>
       </li>
+      <? endif ?>
         <li>
         <?= form::submit(array("id" => "g-registration-admin", "name" => "save", "class" => "submit", "style" => "clear:both!important"), t("Update")) ?>
       </li>
-      <? endif ?>
     </ul>
   <?= form::close_fieldset() ?>
   <?= form::close() ?>