diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 127e322e03567ce3b200499b9771150f8a36f652..8a8e889f12211121e45df1a76e35574199a22006 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -64,7 +64,7 @@
* @see watchdog()
* @see watchdog_severity_levels()
*/
-define('WATCHDOG_EMERG', 0);
+define('WATCHDOG_EMERGENCY', 0);
/**
* Log message severity -- Alert: action must be taken immediately.
diff --git a/includes/common.inc b/includes/common.inc
index 2c2b7bed21feb1090c92d5fe74da788950d6ff9b..6a108a289986a7b70ad18cd13c1455a418322185 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -5992,14 +5992,14 @@ function drupal_parse_info_format($data) {
*/
function watchdog_severity_levels() {
return array(
- WATCHDOG_EMERG => t('emergency'),
- WATCHDOG_ALERT => t('alert'),
- WATCHDOG_CRITICAL => t('critical'),
- WATCHDOG_ERROR => t('error'),
- WATCHDOG_WARNING => t('warning'),
- WATCHDOG_NOTICE => t('notice'),
- WATCHDOG_INFO => t('info'),
- WATCHDOG_DEBUG => t('debug'),
+ WATCHDOG_EMERGENCY => t('emergency'),
+ WATCHDOG_ALERT => t('alert'),
+ WATCHDOG_CRITICAL => t('critical'),
+ WATCHDOG_ERROR => t('error'),
+ WATCHDOG_WARNING => t('warning'),
+ WATCHDOG_NOTICE => t('notice'),
+ WATCHDOG_INFO => t('info'),
+ WATCHDOG_DEBUG => t('debug'),
);
}
diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc
index 0bee419553b24ca447461742d0564af6e6248bb5..181ed7468a27b19a5b0c824441ca86b2bdf34eb4 100644
--- a/modules/dblog/dblog.admin.inc
+++ b/modules/dblog/dblog.admin.inc
@@ -13,24 +13,24 @@ function dblog_overview() {
$filter = dblog_build_filter_query();
$rows = array();
$icons = array(
- WATCHDOG_DEBUG => '',
- WATCHDOG_INFO => '',
- WATCHDOG_NOTICE => '',
- WATCHDOG_WARNING => theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('warning'), 'title' => t('warning'))),
- WATCHDOG_ERROR => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('error'), 'title' => t('error'))),
- WATCHDOG_CRITICAL => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('critical'), 'title' => t('critical'))),
- WATCHDOG_ALERT => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('alert'), 'title' => t('alert'))),
- WATCHDOG_EMERG => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('emergency'), 'title' => t('emergency'))),
+ WATCHDOG_DEBUG => '',
+ WATCHDOG_INFO => '',
+ WATCHDOG_NOTICE => '',
+ WATCHDOG_WARNING => theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('warning'), 'title' => t('warning'))),
+ WATCHDOG_ERROR => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('error'), 'title' => t('error'))),
+ WATCHDOG_CRITICAL => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('critical'), 'title' => t('critical'))),
+ WATCHDOG_ALERT => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('alert'), 'title' => t('alert'))),
+ WATCHDOG_EMERGENCY => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('emergency'), 'title' => t('emergency'))),
);
$classes = array(
- WATCHDOG_DEBUG => 'dblog-debug',
- WATCHDOG_INFO => 'dblog-info',
- WATCHDOG_NOTICE => 'dblog-notice',
- WATCHDOG_WARNING => 'dblog-warning',
- WATCHDOG_ERROR => 'dblog-error',
- WATCHDOG_CRITICAL => 'dblog-critical',
- WATCHDOG_ALERT => 'dblog-alert',
- WATCHDOG_EMERG => 'dblog-emerg',
+ WATCHDOG_DEBUG => 'dblog-debug',
+ WATCHDOG_INFO => 'dblog-info',
+ WATCHDOG_NOTICE => 'dblog-notice',
+ WATCHDOG_WARNING => 'dblog-warning',
+ WATCHDOG_ERROR => 'dblog-error',
+ WATCHDOG_CRITICAL => 'dblog-critical',
+ WATCHDOG_ALERT => 'dblog-alert',
+ WATCHDOG_EMERGENCY => 'dblog-emerg',
);
$build['dblog_filter_form'] = drupal_get_form('dblog_filter_form');
diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index 585ae34405a02a3cd24b3be74dca0807359a1fb2..5da5abf49468b3cab59af9abcf6b5a197c4d8a57 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -390,7 +390,7 @@ class DBLogTestCase extends DrupalWebTestCase {
$types = array();
for ($i = 0; $i < 3; $i++) {
$type_names[] = $type_name = $this->randomName();
- $severity = WATCHDOG_EMERG;
+ $severity = WATCHDOG_EMERGENCY;
for ($j = 0; $j < 3; $j++) {
$types[] = $type = array(
'count' => mt_rand(1, 5),
@@ -506,7 +506,7 @@ class DBLogTestCase extends DrupalWebTestCase {
'dblog-error' => WATCHDOG_ERROR,
'dblog-critical' => WATCHDOG_CRITICAL,
'dblog-alert' => WATCHDOG_ALERT,
- 'dblog-emerg' => WATCHDOG_EMERG,
+ 'dblog-emerg' => WATCHDOG_EMERGENCY,
);
// Find the class that contains the severity.
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index a6fc4032fbe20950dd4d1d41a1d77b53f53a277c..936ca90791e0ff85e859ab0362d0d356434a2a03 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -1312,7 +1312,7 @@ function hook_xmlrpc_alter(&$methods) {
* - ip: The IP address where the request for the page came from.
* - timestamp: The UNIX timestamp of the date/time the event occurred
* - severity: One of the following values as defined in RFC 3164 http://www.faqs.org/rfcs/rfc3164.html
- * WATCHDOG_EMERG Emergency: system is unusable
+ * WATCHDOG_EMERGENCY Emergency: system is unusable
* WATCHDOG_ALERT Alert: action must be taken immediately
* WATCHDOG_CRITICAL Critical: critical conditions
* WATCHDOG_ERROR Error: error conditions
@@ -1327,14 +1327,14 @@ function hook_watchdog(array $log_entry) {
global $base_url, $language;
$severity_list = array(
- WATCHDOG_EMERG => t('Emergency'),
- WATCHDOG_ALERT => t('Alert'),
- WATCHDOG_CRITICAL => t('Critical'),
- WATCHDOG_ERROR => t('Error'),
- WATCHDOG_WARNING => t('Warning'),
- WATCHDOG_NOTICE => t('Notice'),
- WATCHDOG_INFO => t('Info'),
- WATCHDOG_DEBUG => t('Debug'),
+ WATCHDOG_EMERGENCY => t('Emergency'),
+ WATCHDOG_ALERT => t('Alert'),
+ WATCHDOG_CRITICAL => t('Critical'),
+ WATCHDOG_ERROR => t('Error'),
+ WATCHDOG_WARNING => t('Warning'),
+ WATCHDOG_NOTICE => t('Notice'),
+ WATCHDOG_INFO => t('Info'),
+ WATCHDOG_DEBUG => t('Debug'),
);
$to = 'someone@example.com';