From 95610bdd6cd8b607209ed3a6efa58c60ae4b19fb Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
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.

---
 modules/comment.module         | 2 +-
 modules/comment/comment.module | 2 +-
 modules/user.module            | 2 +-
 modules/user/user.module       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules')

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.')));
-- 
cgit v1.2.3