Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.116
diff -u -F^f -r1.116 bootstrap.inc
--- includes/bootstrap.inc	25 Aug 2006 05:42:00 -0000	1.116
+++ includes/bootstrap.inc	27 Aug 2006 02:04:13 -0000
@@ -12,9 +12,10 @@
 define('CACHE_DISABLED', 0);
 define('CACHE_ENABLED', 1);
 
-define('WATCHDOG_NOTICE', 0);
-define('WATCHDOG_WARNING', 1);
-define('WATCHDOG_ERROR', 2);
+define('WATCHDOG_STATUS', 0);
+define('WATCHDOG_NOTICE', 1);
+define('WATCHDOG_WARNING', 2);
+define('WATCHDOG_ERROR', 3);
 
 define('DRUPAL_BOOTSTRAP_CONFIGURATION', 0);
 define('DRUPAL_BOOTSTRAP_EARLY_PAGE_CACHE', 1);
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.566
diff -u -F^f -r1.566 common.inc
--- includes/common.inc	26 Aug 2006 00:23:12 -0000	1.566
+++ includes/common.inc	27 Aug 2006 02:04:13 -0000
@@ -1709,7 +1709,7 @@ function drupal_cron_run() {
   // Clean up
   variable_set('cron_busy', FALSE);
   variable_set('cron_last', time());
-  watchdog('cron', t('Cron run completed.'), WATCHDOG_NOTICE);
+  watchdog('cron', t('Cron run completed.'), WATCHDOG_STATUS);
 
   // Return TRUE so other functions can check if it did run successfully
   return TRUE;
Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.88
diff -u -F^f -r1.88 locale.inc
--- includes/locale.inc	18 Aug 2006 18:58:44 -0000	1.88
+++ includes/locale.inc	27 Aug 2006 02:04:14 -0000
@@ -29,7 +29,7 @@ function _locale_add_language($code, $na
     drupal_set_message(t('The language %locale has been created.', array('%locale' => t($name))));
   }
 
-  watchdog('locale', t('The %language language (%locale) has been created.', array('%language' => $name, '%locale' => $code)));
+  watchdog('locale', t('The %language language (%locale) has been created.', array('%language' => $name, '%locale' => $code)), WATCHDOG_STATUS);
 }
 
 /**
@@ -1096,7 +1096,7 @@ function _locale_export_po($language) {
       $header .= "\"Plural-Forms: nplurals=". $meta->plurals ."; plural=". strtr($meta->formula, '$', '') .";\\n\"\n";
     }
     $header .= "\n";
-    watchdog('locale', t('Exported %locale translation file: %filename.', array('%locale' => $meta->name, '%filename' => $filename)));
+    watchdog('locale', t('Exported %locale translation file: %filename.', array('%locale' => $meta->name, '%filename' => $filename)), WATCHDOG_STATUS);
   }
 
   // Generating Portable Object Template
@@ -1117,7 +1117,7 @@ function _locale_export_po($language) {
     $header .= "\"Content-Transfer-Encoding: 8bit\\n\"\n";
     $header .= "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n\"\n";
     $header .= "\n";
-    watchdog('locale', t('Exported translation file: %filename.', array('%filename' => $filename)));
+    watchdog('locale', t('Exported translation file: %filename.', array('%filename' => $filename)), WATCHDOG_STATUS);
   }
 
   // Start download process
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.302
diff -u -F^f -r1.302 aggregator.module
--- modules/aggregator/aggregator.module	23 Aug 2006 18:38:41 -0000	1.302
+++ modules/aggregator/aggregator.module	27 Aug 2006 02:04:15 -0000
@@ -394,7 +394,7 @@ function aggregator_form_category_submit
     }
   }
   else {
-    watchdog('aggregator', t('Category %category added.', array('%category' => $form_values['title'])), WATCHDOG_NOTICE, l(t('view'), 'admin/content/aggregator'));
+    watchdog('aggregator', t('Category %category added.', array('%category' => $form_values['title'])), WATCHDOG_STATUS, l(t('view'), 'admin/content/aggregator'));
     drupal_set_message(t('The category %category has been added.', array('%category' => $form_values['title'])));
   }
 }
@@ -527,7 +527,7 @@ function aggregator_form_feed_submit($fo
     }
   }
   else {
-    watchdog('aggregator', t('Feed %feed added.', array('%feed' => $form_values['title'])), WATCHDOG_NOTICE, l(t('view'), 'admin/content/aggregator'));
+    watchdog('aggregator', t('Feed %feed added.', array('%feed' => $form_values['title'])), WATCHDOG_STATUS, l(t('view'), 'admin/content/aggregator'));
     drupal_set_message(t('The feed %feed has been added.', array('%feed' => $form_values['title'])));
   }
 }
@@ -716,7 +716,7 @@ function aggregator_refresh($feed) {
       break;
     case 301:
       $feed['url'] = $result->redirect_url;
-      watchdog('aggregator', t('Updated URL for feed %title to %url.', array('%title' => $feed['title'], '%url' => $feed['url'])));
+      watchdog('aggregator', t('Updated URL for feed %title to %url.', array('%title' => $feed['title'], '%url' => $feed['url'])), WATCHDOG_STATUS);
 
     case 200:
     case 302:
@@ -764,7 +764,7 @@ function aggregator_refresh($feed) {
 
         cache_clear_all();
 
-        watchdog('aggregator', t('There is new syndicated content from %site.', array('%site' => $feed['title'])));
+        watchdog('aggregator', t('There is new syndicated content from %site.', array('%site' => $feed['title'])), WATCHDOG_STATUS);
         drupal_set_message(t('There is new syndicated content from %site.', array('%site' => $feed['title'])));
       }
       break;
Index: modules/blogapi/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v
retrieving revision 1.94
diff -u -F^f -r1.94 blogapi.module
--- modules/blogapi/blogapi.module	18 Aug 2006 18:58:44 -0000	1.94
+++ modules/blogapi/blogapi.module	27 Aug 2006 02:04:15 -0000
@@ -226,7 +226,7 @@ function blogapi_blogger_new_post($appke
   $node = node_submit($edit);
   node_save($node);
   if ($node->nid) {
-    watchdog('content', t('@type: added %title using blog API.', array('@type' => t($node->type), '%title' => $node->title)), WATCHDOG_NOTICE, l(t('view'), "node/$node->nid"));
+    watchdog('content', t('@type: added %title using blog API.', array('@type' => t($node->type), '%title' => $node->title)), WATCHDOG_STATUS, l(t('view'), "node/$node->nid"));
     // blogger.newPost returns a string so we cast the nid to a string by putting it in double quotes:
     return "$node->nid";
   }
@@ -282,7 +282,7 @@ function blogapi_blogger_edit_post($appk
   $node = node_submit($node);
   node_save($node);
   if ($node->nid) {
-    watchdog('content', t('@type: updated %title using blog API.', array('@type' => t($node->type), '%title' => $node->title)), WATCHDOG_NOTICE, l(t('view'), "node/$node->nid"));
+    watchdog('content', t('@type: updated %title using blog API.', array('@type' => t($node->type), '%title' => $node->title)), WATCHDOG_STATUS, l(t('view'), "node/$node->nid"));
     return TRUE;
   }
 
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.386
diff -u -F^f -r1.386 book.module
--- modules/book/book.module	23 Aug 2006 06:38:49 -0000	1.386
+++ modules/book/book.module	27 Aug 2006 02:04:15 -0000
@@ -943,7 +943,7 @@ function book_admin_edit_submit($form_id
       $node->weight = $row['weight'];
 
       node_save($node);
-      watchdog('content', t('%type: updated %title.', array('%type' => t('book'), '%title' => $node->title)), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid));
+      watchdog('content', t('%type: updated %title.', array('%type' => t('book'), '%title' => $node->title)), WATCHDOG_STATUS, l(t('view'), 'node/'. $node->nid));
     }
   }
 
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.478
diff -u -F^f -r1.478 comment.module
--- modules/comment/comment.module	22 Aug 2006 11:13:03 -0000	1.478
+++ modules/comment/comment.module	27 Aug 2006 02:04:16 -0000
@@ -598,7 +598,7 @@ function comment_save($edit) {
 
 
         // Add an entry to the watchdog log.
-        watchdog('content', t('Comment: updated %subject.', array('%subject' => $edit['subject'])), WATCHDOG_NOTICE, l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid']));
+        watchdog('content', t('Comment: updated %subject.', array('%subject' => $edit['subject'])), WATCHDOG_STATUS, l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid']));
       }
       else {
         // Add the comment to database.
@@ -671,7 +671,7 @@ function comment_save($edit) {
         comment_invoke_comment($edit, 'insert');
 
         // Add an entry to the watchdog log.
-        watchdog('content', t('Comment: added %subject.', array('%subject' => $edit['subject'])), WATCHDOG_NOTICE, l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid']));
+        watchdog('content', t('Comment: added %subject.', array('%subject' => $edit['subject'])), WATCHDOG_STATUS, l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid']));
       }
 
       // Clear the cache so an anonymous user can see his comment being added.
@@ -1076,7 +1076,7 @@ function comment_admin_overview_submit($
         // Allow modules to respond to the updating of a comment.
         comment_invoke_comment($comment, $edit['operation']);
         // Add an entry to the watchdog log.
-        watchdog('content', t('Comment: updated %subject.', array('%subject' => $comment->subject)), WATCHDOG_NOTICE, l(t('view'), 'node/'. $comment->nid, NULL, NULL, 'comment-'. $comment->cid));
+        watchdog('content', t('Comment: updated %subject.', array('%subject' => $comment->subject)), WATCHDOG_STATUS, l(t('view'), 'node/'. $comment->nid, NULL, NULL, 'comment-'. $comment->cid));
       }
     }
     cache_clear_all();
Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.63
diff -u -F^f -r1.63 contact.module
--- modules/contact/contact.module	20 Aug 2006 05:57:40 -0000	1.63
+++ modules/contact/contact.module	27 Aug 2006 02:04:17 -0000
@@ -242,13 +242,13 @@ function contact_admin_edit_submit($form
   if (arg(3) == 'add') {
     db_query("INSERT INTO {contact} (category, recipients, reply, weight, selected) VALUES ('%s', '%s', '%s', %d, %d)", $form_values['category'], $form_values['recipients'], $form_values['reply'], $form_values['weight'], $form_values['selected']);
     drupal_set_message(t('Category %category has been added.', array('%category' => $form_values['category'])));
-    watchdog('mail', t('Contact form: category %category added.', array('%category' => $form_values['category'])), WATCHDOG_NOTICE, l(t('view'), 'admin/build/contact'));
+    watchdog('mail', t('Contact form: category %category added.', array('%category' => $form_values['category'])), WATCHDOG_STATUS, l(t('view'), 'admin/build/contact'));
 
   }
   else {
     db_query("UPDATE {contact} SET category = '%s', recipients = '%s', reply = '%s', weight = %d, selected = %d WHERE cid = %d", $form_values['category'], $form_values['recipients'], $form_values['reply'], $form_values['weight'], $form_values['selected'], $form_values['cid']);
     drupal_set_message(t('Category %category has been updated.', array('%category' => $form_values['category'])));
-    watchdog('mail', t('Contact form: category %category updated.', array('%category' => $form_values['category'])), WATCHDOG_NOTICE, l(t('view'), 'admin/build/contact'));
+    watchdog('mail', t('Contact form: category %category updated.', array('%category' => $form_values['category'])), WATCHDOG_STATUS, l(t('view'), 'admin/build/contact'));
   }
 
   return 'admin/build/contact';
@@ -277,7 +277,7 @@ function contact_admin_delete($cid = NUL
 function contact_admin_delete_submit($form_id, $form_values) {
   db_query("DELETE FROM {contact} WHERE cid = %d", arg(4));
   drupal_set_message(t('Category %category has been deleted.', array('%category' => $form_values['category'])));
-  watchdog('mail', t('Contact form: category %category deleted.', array('%category' => $form_values['category'])), WATCHDOG_NOTICE);
+  watchdog('mail', t('Contact form: category %category deleted.', array('%category' => $form_values['category'])));
 
   return 'admin/build/contact';
 }
@@ -397,7 +397,7 @@ function contact_mail_user_submit($form_
 
   // Log the operation:
   flood_register_event('contact');
-  watchdog('mail', t('%name-from sent %name-to an e-mail.', array('%name-from' => $user->name, '%name-to' => $account->name)));
+  watchdog('mail', t('%name-from sent %name-to an e-mail.', array('%name-from' => $user->name, '%name-to' => $account->name)), WATCHDOG_STATUS);
 
   // Set a status message:
   drupal_set_message(t('The message has been sent.'));
@@ -544,7 +544,7 @@ function contact_mail_page_submit($form_
 
   // Log the operation:
   flood_register_event('contact');
-  watchdog('mail', t('%name-from sent an e-mail regarding %category.', array('%name-from' => $edit['name'] ." <$from>", '%category' => $contact->category)));
+  watchdog('mail', t('%name-from sent an e-mail regarding %category.', array('%name-from' => $edit['name'] ." <$from>", '%category' => $contact->category)), WATCHDOG_STATUS);
 
   // Update user:
   drupal_set_message(t('Your message has been sent.'));
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.82
diff -u -F^f -r1.82 menu.module
--- modules/menu/menu.module	22 Aug 2006 11:13:03 -0000	1.82
+++ modules/menu/menu.module	27 Aug 2006 02:04:17 -0000
@@ -464,11 +464,11 @@ function menu_item_delete_form_submit($f
   $t_args = array('%title' => theme('placeholder', $form_values['title']));
   if ($form_values['type'] & MENU_IS_ROOT) {
     drupal_set_message(t('The menu %title has been deleted.', $t_args));
-    watchdog('menu', t('Deleted menu %title.', $t_args), WATCHDOG_NOTICE);
+    watchdog('menu', t('Deleted menu %title.', $t_args));
   }
   else {
     drupal_set_message(t('The menu item %title has been deleted.', $t_args));
-    watchdog('menu', t('Deleted menu item %title.', $t_args), WATCHDOG_NOTICE);
+    watchdog('menu', t('Deleted menu item %title.', $t_args));
   }
 
   return 'admin/build/menu';
@@ -543,7 +543,7 @@ function menu_edit_item_save($edit) {
   }
   elseif ($status == SAVED_NEW) {
     drupal_set_message(t('The menu item %title has been added.', $t_args));
-    watchdog('menu', t('Added menu item %title.', $t_args), WATCHDOG_NOTICE, l(t('view'), 'admin/build/menu'));
+    watchdog('menu', t('Added menu item %title.', $t_args), WATCHDOG_STATUS, l(t('view'), 'admin/build/menu'));
   }
   return $edit['mid'];
 }
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.5
diff -u -F^f -r1.5 content_types.inc
--- modules/node/content_types.inc	23 Aug 2006 04:40:56 -0000	1.5
+++ modules/node/content_types.inc	27 Aug 2006 02:04:17 -0000
@@ -332,7 +332,7 @@ function node_type_form_submit($form_id,
   }
   elseif ($status == SAVED_NEW) {
     drupal_set_message(t('The content type %name has been added.', $t_args));
-    watchdog('node', t('Added content type %name.', $t_args), WATCHDOG_NOTICE, l(t('view'), 'admin/content/types'));
+    watchdog('node', t('Added content type %name.', $t_args), WATCHDOG_STATUS, l(t('view'), 'admin/content/types'));
   }
 
   return 'admin/content/types';
@@ -387,7 +387,7 @@ function node_type_delete_form_submit($f
 
   $t_args = array('%name' => $form_values['name']);
   drupal_set_message(t('The content type %name has been deleted.', $t_args));
-  watchdog('menu', t('Deleted content type %name.', $t_args), WATCHDOG_NOTICE);
+  watchdog('menu', t('Deleted content type %name.', $t_args));
 
   node_types_rebuild();
   menu_rebuild();
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.687
diff -u -F^f -r1.687 node.module
--- modules/node/node.module	26 Aug 2006 18:21:00 -0000	1.687
+++ modules/node/node.module	27 Aug 2006 02:04:19 -0000
@@ -2128,7 +2128,7 @@ function node_form_submit($form_id, $edi
     // perform this operation:
     if (node_access('update', $node)) {
       node_save($node);
-      watchdog('content', t('@type: updated %title.', array('@type' => t($node->type), '%title' => $node->title)), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid));
+      watchdog('content', t('@type: updated %title.', array('@type' => t($node->type), '%title' => $node->title)), WATCHDOG_STATUS, l(t('view'), 'node/'. $node->nid));
       drupal_set_message(t('The %post was updated.', array ('%post' => node_get_types('name', $node))));
     }
   }
@@ -2137,7 +2137,7 @@ function node_form_submit($form_id, $edi
     // perform this operation:
     if (node_access('create', $node)) {
       node_save($node);
-      watchdog('content', t('@type: added %title.', array('@type' => t($node->type), '%title' => $node->title)), WATCHDOG_NOTICE, l(t('view'), "node/$node->nid"));
+      watchdog('content', t('@type: added %title.', array('@type' => t($node->type), '%title' => $node->title)), WATCHDOG_STATUS, l(t('view'), "node/$node->nid"));
       drupal_set_message(t('Your %post was created.', array ('%post' => node_get_types('name', $node))));
     }
   }
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.167
diff -u -F^f -r1.167 profile.module
--- modules/profile/profile.module	20 Aug 2006 07:07:17 -0000	1.167
+++ modules/profile/profile.module	27 Aug 2006 02:04:19 -0000
@@ -346,7 +346,7 @@ function profile_field_form_submit($form
     db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, autocomplete, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, '%s', '%s')", $form_values['title'], $form_values['name'], $form_values['explanation'], $form_values['category'], $form_values['type'], $form_values['weight'], $form_values['required'], $form_values['register'], $form_values['visibility'], $form_values['autocomplete'], $form_values['options'], $form_values['page']);
 
     drupal_set_message(t('The field has been created.'));
-    watchdog('profile', t('Profile field %field added under category %category.', array('%field' => theme('placeholder', $form_values['title']), '%category' => theme('placeholder', $form_values['category']))), WATCHDOG_NOTICE, l(t('view'), 'admin/user/profile'));
+    watchdog('profile', t('Profile field %field added under category %category.', array('%field' => theme('placeholder', $form_values['title']), '%category' => theme('placeholder', $form_values['category']))), WATCHDOG_STATUS, l(t('view'), 'admin/user/profile'));
   }
   else {
     db_query("UPDATE {profile_fields} SET title = '%s', name = '%s', explanation = '%s', category = '%s', weight = %d, required = %d, register = %d, visibility = %d, autocomplete = %d, options = '%s', page = '%s' WHERE fid = %d", $form_values['title'], $form_values['name'], $form_values['explanation'], $form_values['category'], $form_values['weight'], $form_values['required'], $form_values['register'], $form_values['visibility'], $form_values['autocomplete'], $form_values['options'], $form_values['page'], $form_values['fid']);
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.12
diff -u -F^f -r1.12 system.install
--- modules/system/system.install	24 Aug 2006 06:27:41 -0000	1.12
+++ modules/system/system.install	27 Aug 2006 02:04:21 -0000
@@ -2569,7 +2569,7 @@ function system_update_177() {
     if ($admin_setting = variable_get('user_mail_'. $message_id, FALSE)) {
       // Insert newlines and escape for display as HTML
       $admin_setting = nl2br(check_plain($message_text ."\n\n". $admin_setting));
-      watchdog('legacy', $admin_setting);
+      watchdog('legacy', $admin_setting, WATCHDOG_STATUS);
       $last = db_fetch_object(db_query('SELECT max(wid) AS wid FROM {watchdog}'));
       // Deleting is required, because _user_mail_text() checks for the existance of the variable.
       variable_del('user_mail_'. $message_id);
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.661
diff -u -F^f -r1.661 user.module
--- modules/user/user.module	25 Aug 2006 09:01:12 -0000	1.661
+++ modules/user/user.module	27 Aug 2006 02:04:22 -0000
@@ -922,7 +922,7 @@ function user_login_submit($form_id, $fo
     else {
        $message = "Session opened for ". check_plain($user->name);
     }
-    watchdog('user', $message);
+    watchdog('user', $message, WATCHDOG_STATUS);
 
     // Update the user table timestamp noting user has logged in.
     db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $user->uid);
@@ -956,7 +956,7 @@ function user_authenticate($name, $pass)
   if ($server && ($result = user_get_authmaps("$name@$server"))) {
     if (module_invoke(key($result), 'auth', $name, $pass, $server)) {
       $user = user_external_load("$name@$server");
-      watchdog('user', t('External load by %user using module %module.', array('%user' => $name .'@'. $server, '%module' => key($result))));
+      watchdog('user', t('External load by %user using module %module.', array('%user' => $name .'@'. $server, '%module' => key($result))), WATCHDOG_STATUS);
     }
   }
 
@@ -975,7 +975,7 @@ function user_authenticate($name, $pass)
             $userinfo["authname_$module"] = $name;
           }
           $user = user_save('', $userinfo);
-          watchdog('user', t('New external user: %user using module %module.', array('%user' => $name, '%module' => $module)), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+          watchdog('user', t('New external user: %user using module %module.', array('%user' => $name, '%module' => $module)), WATCHDOG_STATUS, l(t('edit'), 'user/'. $user->uid .'/edit'));
           break;
         }
       }
@@ -990,7 +990,7 @@ function user_authenticate($name, $pass)
 function user_logout() {
   global $user;
 
-  watchdog('user', t('Session closed for %name.', array('%name' => $user->name)));
+  watchdog('user', t('Session closed for %name.', array('%name' => $user->name)), WATCHDOG_STATUS);
 
   // Destroy the current session:
   session_destroy();
@@ -1051,7 +1051,7 @@ function user_pass_submit($form_id, $for
   $mail_success = drupal_mail('user-pass', $account->mail, $subject, $body, $from);
 
   if ($mail_success) {
-    watchdog('user', t('Password reset instructions mailed to %name at %email.', array('%name' => $account->name, '%email' => $account->mail)));
+    watchdog('user', t('Password reset instructions mailed to %name at %email.', array('%name' => $account->name, '%email' => $account->mail)), WATCHDOG_STATUS);
     drupal_set_message(t('Further instructions have been sent to your e-mail address.'));
   }
   else {
@@ -1092,7 +1092,7 @@ function user_pass_reset($uid, $timestam
       else if ($account->uid && $timestamp > $account->login && $timestamp < $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
         // First stage is a confirmation form, then login
         if ($action == 'login') {
-          watchdog('user', t('User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp)));
+          watchdog('user', t('User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp)), WATCHDOG_STATUS);
           // Update the user table noting user has logged in.
           // And this also makes this hashed password a one-time-only login.
           db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $account->uid);
@@ -1216,7 +1216,7 @@ function user_register_submit($form_id, 
   }
 
   $account = user_save('', array_merge($form_values, array('pass' => $pass, 'init' => $mail, 'roles' => $roles, 'status' => ($admin || variable_get('user_register', 1) == 1))));
-  watchdog('user', t('New user: %name %email.', array('%name' => theme('placeholder', $name), '%email' => '<'. $mail .'>')), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $account->uid .'/edit'));
+  watchdog('user', t('New user: %name %email.', array('%name' => theme('placeholder', $name), '%email' => '<'. $mail .'>')), WATCHDOG_STATUS, l(t('edit'), 'user/'. $account->uid .'/edit'));
 
   $variables = array('!username' => $name, '!site' => variable_get('site_name', 'drupal'), '!password' => $pass, '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '!mailto' => $mail, '!date' => format_date(time()), '!login_uri' => url('user', NULL, NULL, TRUE), '!edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE), '!login_url' => user_pass_reset_url($account));
 
@@ -1438,7 +1438,7 @@ function user_delete($edit, $uid) {
   db_query('DELETE FROM {users_roles} WHERE uid = %d', $uid);
   db_query('DELETE FROM {authmap} WHERE uid = %d', $uid);
   $array = array('%name' => theme('placeholder', $account->name), '%email' => theme('placeholder', '<'. $account->mail .'>'));
-  watchdog('user', t('Deleted user: %name %email.', $array), WATCHDOG_NOTICE);
+  watchdog('user', t('Deleted user: %name %email.', $array));
   drupal_set_message(t('%name has been deleted.', $array));
   module_invoke_all('user', 'delete', $edit, $account);
 }
Index: modules/watchdog/watchdog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/watchdog/watchdog.module,v
retrieving revision 1.151
diff -u -F^f -r1.151 watchdog.module
--- modules/watchdog/watchdog.module	23 Aug 2006 18:16:45 -0000	1.151
+++ modules/watchdog/watchdog.module	27 Aug 2006 02:04:22 -0000
@@ -84,10 +84,11 @@ function watchdog_user($op, &$edit, &$us
 }
 
 function watchdog_form_overview() {
-  $icons = array(WATCHDOG_NOTICE  => '',
+  $icons = array(WATCHDOG_STATUS => '',
+                 WATCHDOG_NOTICE  => '',
                  WATCHDOG_WARNING => theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning')),
                  WATCHDOG_ERROR   => theme('image', 'misc/watchdog-error.png', t('error'), t('error')));
-  $classes = array(WATCHDOG_NOTICE => 'watchdog-notice', WATCHDOG_WARNING => 'watchdog-warning', WATCHDOG_ERROR => 'watchdog-error');
+  $classes = array(WATCHDOG_STATUS => 'watchdog-status', WATCHDOG_NOTICE => 'watchdog-notice', WATCHDOG_WARNING => 'watchdog-warning', WATCHDOG_ERROR => 'watchdog-error');
 
   $names['all'] = t('all messages');
   foreach (_watchdog_get_message_types() as $type) {
@@ -173,7 +174,7 @@ function watchdog_form_overview_submit($
  * Menu callback; displays details about a log message.
  */
 function watchdog_event($id) {
-  $severity = array(WATCHDOG_NOTICE => t('notice'), WATCHDOG_WARNING => t('warning'), WATCHDOG_ERROR => t('error'));
+  $severity = array(WATCHDOG_STATUS => t('status'), WATCHDOG_NOTICE => t('notice'), WATCHDOG_WARNING => t('warning'), WATCHDOG_ERROR => t('error'));
   $output = '';
   $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id);
   if ($watchdog = db_fetch_object($result)) {