Commit 95610bdd authored by Dries's avatar Dries

- 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.
parent 29337ad8
......@@ -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;
}
}
......
......@@ -1468,7 +1468,7 @@ function theme_comment_threshold($threshold) {
$result = db_query('SELECT fid, filter FROM {moderation_filters} ');
$options .= ' <option value="0">'. t('-- threshold --') .'</option>';
while ($filter = db_fetch_object($result)) {
$filters .= " <option value=\"$filter->fid\"". ($threshold == $filter->fid ? ' selected="selected"' : '') .'>'. t($filter->filter) .'</option>';
$filters .= " <option value=\"$filter->fid\"". ($threshold == $filter->fid ? ' selected="selected"' : '') .'>'. $filter->filter .'</option>';
}
if ($filters) {
......
......@@ -1468,7 +1468,7 @@ function theme_comment_threshold($threshold) {
$result = db_query('SELECT fid, filter FROM {moderation_filters} ');
$options .= ' <option value="0">'. t('-- threshold --') .'</option>';
while ($filter = db_fetch_object($result)) {
$filters .= " <option value=\"$filter->fid\"". ($threshold == $filter->fid ? ' selected="selected"' : '') .'>'. t($filter->filter) .'</option>';
$filters .= " <option value=\"$filter->fid\"". ($threshold == $filter->fid ? ' selected="selected"' : '') .'>'. $filter->filter .'</option>';
}
if ($filters) {
......
......@@ -607,7 +607,7 @@ function theme_user_picture($account) {
}
if ($picture) {
$alt = t('%user\'s picture', array('%user' => $account->name ? $account->name : t(variable_get('anonymous', 'Anonymous'))));
$alt = t('%user\'s picture', array('%user' => $account->name ? $account->name : variable_get('anonymous', 'Anonymous')));
$picture = theme('image', $picture, $alt, $alt, '', false);
if ($account->uid) {
$picture = l($picture, "user/$account->uid", array('title' => t('View user profile.')));
......
......@@ -607,7 +607,7 @@ function theme_user_picture($account) {
}
if ($picture) {
$alt = t('%user\'s picture', array('%user' => $account->name ? $account->name : t(variable_get('anonymous', 'Anonymous'))));
$alt = t('%user\'s picture', array('%user' => $account->name ? $account->name : variable_get('anonymous', 'Anonymous')));
$picture = theme('image', $picture, $alt, $alt, '', false);
if ($account->uid) {
$picture = l($picture, "user/$account->uid", array('title' => t('View user profile.')));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment