From 95610bdd6cd8b607209ed3a6efa58c60ae4b19fb Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 29 Nov 2004 17:52:35 +0000 Subject: - Patch #13647 by Goba: 1. Fixed broken watchdog calls: two watchdog calls omitted the type parameter, and thus injected logs into the type field, instead of the message field. 2. Removed t() functions from user contributed content. --- includes/common.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'includes') diff --git a/includes/common.inc b/includes/common.inc index c7b22d1eb..be339f011 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -887,7 +887,7 @@ function format_name($object) { $output .= ' ('. t('not verified') .')'; } else { - $output = t(variable_get('anonymous', 'Anonymous')); + $output = variable_get('anonymous', 'Anonymous'); } return $output; @@ -1600,7 +1600,7 @@ function drupal_xml_parser_create(&$data) { $out = @recode_string($encoding . '..utf-8', $data); } else { - watchdog(t("Unsupported XML encoding '%s'. Please install iconv, GNU recode or mbstring for PHP.", $encoding)); + watchdog('warning', t("Unsupported XML encoding '%s'. Please install iconv, GNU recode or mbstring for PHP.", $encoding)); return 0; } @@ -1609,7 +1609,7 @@ function drupal_xml_parser_create(&$data) { $encoding = 'utf-8'; } else { - watchdog(t("Could not convert XML encoding '%s' to UTF-8.", $encoding)); + watchdog('warning', t("Could not convert XML encoding '%s' to UTF-8.", $encoding)); return 0; } } -- cgit v1.2.3