Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- 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.
4.6.x
Dries Buytaert 2004-11-29 17:52:35 +00:00
parent 29337ad8bb
commit 95610bdd6c
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/common.inc
View File

@ -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;
}
}

2
modules/comment.module
View File

@ -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) {

2
modules/comment/comment.module
View File

@ -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) {

2
modules/user.module
View File

@ -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.')));

2
modules/user/user.module
View File

@ -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.')));