Index: advuser.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/advuser/advuser.module,v
retrieving revision 1.13.2.6
diff -u -p -r1.13.2.6 advuser.module
--- advuser.module	1 May 2008 16:58:17 -0000	1.13.2.6
+++ advuser.module	2 May 2008 17:43:07 -0000
@@ -508,23 +508,21 @@ function advuser_settings() {
  * @param $user the user account
  * @return An associative array of substitution variables 
  */
-function _advuser_get_variables(&$user) {
-  $variables = array(
+function _advuser_get_variables($user) {
+  return array(
     '%user_name' => $user->name,
     '%site' => variable_get("site_name", "drupal"), 
     '%uri' => url('user/'. $user->uid, NULL, NULL, TRUE), 
     '%user_email' => $user->mail,
-    '%user_status' => $user->status,
-    '%user_theme' => $user->theme,
+    '%user_status' => t($user->status ? 'Active' : 'Blocked'),
+    '%user_theme' => empty($user->theme) ? t('DEFAULT') : $user->theme,
     '%user_created' => strftime('%x %X', $user->created),
-    '%user_language' => $user->language,
-    '%user_timezone' => $user->timezone,
+    '%user_language' => empty($user->language) ? t('DEFAULT') : $user->language,
+    '%user_timezone' => empty($user->timezone) ? '0' : "$user->timezone",
     '%user_signature' => $user->signature,
     '%google_user' => "http://www.google.com/search?q=%22$user->mail%22",
     '%yahoo_user' => "http://search.yahoo.com/search/?p=%22$user->mail%22", 
   );
-
-  return $variables;
 }
 
 /**
@@ -640,10 +638,10 @@ function advuser_user($type, &$edit, &$u
   switch ($type) {
     case 'insert': {
       $return = advuser_user_insert($edit, $user, $category);
-    }
-    case 'update': {
+    } break;
+    case 'after_update': {
       $return = advuser_user_update($edit, $user, $category);
-    }
+    } break;
   }
   return $return;
 }