- 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.

5 files changed, 7 insertions, 7 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;
     }
   }
diff --git a/modules/comment.module b/modules/comment.module
index 964a9cdd4..889e0c4de 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -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) {
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 964a9cdd4..889e0c4de 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -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) {
diff --git a/modules/user.module b/modules/user.module
index cabb5b773..621b81db9 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -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.')));
diff --git a/modules/user/user.module b/modules/user/user.module
index cabb5b773..621b81db9 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -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.')));