summaryrefslogtreecommitdiff
path: root/modules
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 /modules
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 'modules')
-rw-r--r--modules/comment.module2
-rw-r--r--modules/comment/comment.module2
-rw-r--r--modules/user.module2
-rw-r--r--modules/user/user.module2
4 files changed, 4 insertions, 4 deletions
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.')));