summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module20
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index dbb25ef73..1f1493385 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -602,7 +602,7 @@ function user_login($edit = array(), $msg = "") {
*/
if ($error) {
- $output .= theme_invoke("theme_error", check_output($error));
+ $output .= theme_invoke("theme_error", $error);
}
/*
@@ -705,7 +705,7 @@ function user_pass($edit = array()) {
// Display error message if necessary.
if ($error) {
- $output .= theme_invoke("theme_error", check_output($error));
+ $output .= theme_invoke("theme_error", $error);
}
/*
@@ -827,7 +827,7 @@ function user_register($edit = array()) {
}
else {
if ($error) {
- $output .= theme_invoke("theme_error", check_output($error));
+ $output .= theme_invoke("theme_error", $error);
}
}
@@ -944,7 +944,7 @@ function user_edit($edit = array()) {
}
if ($error) {
- $output .= theme_invoke("theme_error", check_output($error));
+ $output .= theme_invoke("theme_error", $error);
}
if (!$edit) {
@@ -997,8 +997,8 @@ function user_view($uid = 0) {
}
if ($user->uid && $user->uid == $uid) {
- $output = form_item(t("Name"), check_output("$user->name ($user->init)"));
- $output .= form_item(t("E-mail address"), check_output($user->mail));
+ $output = form_item(t("Name"), "$user->name ($user->init)");
+ $output .= form_item(t("E-mail address"), $user->mail);
foreach (module_list() as $module) {
if (module_hook($module, "user")) {
@@ -1012,7 +1012,7 @@ function user_view($uid = 0) {
$theme->footer();
}
else if ($uid && $account = user_load(array("uid" => $uid, "status" => 1))) {
- $output = form_item(t("Name"), check_output($account->name));
+ $output = form_item(t("Name"), $account->name);
foreach (module_list() as $module) {
if (module_hook($module, "user")) {
@@ -1144,7 +1144,7 @@ function user_admin_create($edit = array()) {
else {
if ($error) {
- $output .= theme_invoke("theme_error", check_output($error));
+ $output .= theme_invoke("theme_error", $error);
}
$output .= form_textfield(t("Username"), "name", $edit["name"], 30, 55, t("Provide the username of the new account."));
@@ -1401,7 +1401,7 @@ function user_admin_edit($edit = array()) {
$output .= status(t("your user information changes have been saved."));
}
else {
- $output .= theme_invoke("theme_error", check_output($error));
+ $output .= theme_invoke("theme_error", $error);
}
}
else if ($op == t("Delete account")) {
@@ -1419,7 +1419,7 @@ function user_admin_edit($edit = array()) {
** Display user form:
*/
- $output .= form_item(t("User ID"), check_output($account->uid));
+ $output .= form_item(t("User ID"), $account->uid);
$output .= form_textfield(t("Username"), "name", $account->name, 30, 55, t("Your full name or your preferred username: only letters, numbers and spaces are allowed."));
$output .= form_textfield(t("E-mail address"), "mail", $account->mail, 30, 55, t("Insert a valid e-mail address. All e-mails from the system will be sent to this address. The e-mail address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by e-mail."));