summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-11-29 17:52:35 +0000
committerDries Buytaert <dries@buytaert.net>2004-11-29 17:52:35 +0000
commit95610bdd6cd8b607209ed3a6efa58c60ae4b19fb (patch)
tree10dd222d5d65c01bef8c15912e31f67be213635a /includes
parent29337ad8bbcf9388cf41e88193764cc2cb8b87f2 (diff)
downloadbrdo-95610bdd6cd8b607209ed3a6efa58c60ae4b19fb.tar.gz
brdo-95610bdd6cd8b607209ed3a6efa58c60ae4b19fb.tar.bz2
- 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.
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc6
1 files changed, 3 insertions, 3 deletions
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;
}
}