summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/user.admin.inc2
-rw-r--r--modules/user/user.css2
-rw-r--r--modules/user/user.module2
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index bbce9b62b..9eed7c5cc 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -702,7 +702,7 @@ function user_admin_permissions($form, $form_state, $rid = NULL) {
$form['checkboxes'][$rid] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => isset($status[$rid]) ? $status[$rid] : array());
$form['role_names'][$rid] = array('#markup' => $name, '#tree' => TRUE);
}
-
+
$form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions')));
$form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save permissions'));
diff --git a/modules/user/user.css b/modules/user/user.css
index 5a1bf5c67..51222f0c1 100644
--- a/modules/user/user.css
+++ b/modules/user/user.css
@@ -29,7 +29,7 @@
padding-bottom: .5em;
}
-/**
+/**
* Override default textfield float to put the "Add role" button next to
* the input textfield.
*/
diff --git a/modules/user/user.module b/modules/user/user.module
index dca04f216..ed9aa6bf0 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2350,7 +2350,7 @@ password: Your password
break;
case 'status_blocked_body':
$text = t("!user-name-token,
-
+
Your account on !site-name-token has been blocked.
-- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode));