summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2015-05-04 23:54:42 -0400
committerDavid Rothstein <drothstein@gmail.com>2015-05-04 23:54:42 -0400
commit992c34675ab5910d8d93cd2a1a2ed28aaffe35d9 (patch)
tree91f7d901367839490d15b3a0614c44cf6783c51d
parent254424dcfa2a165be18fec2917f6fbd22fbd9970 (diff)
downloadbrdo-992c34675ab5910d8d93cd2a1a2ed28aaffe35d9.tar.gz
brdo-992c34675ab5910d8d93cd2a1a2ed28aaffe35d9.tar.bz2
Issue #1055150 by Devin Carlson, rootwork, yoroy, brianV, JimmyAx: Time zone description is confusing on user register form
-rw-r--r--CHANGELOG.txt2
-rw-r--r--modules/system/system.module1
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 436b0e148..4ed9724ab 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
Drupal 7.37, xxxx-xx-xx (development version)
-----------------------
+- Removed a confusing description regarding automatic time zone detection from
+ the user account form (minor UI and data structure change).
- Allowed custom HTML tags with a dash in the name to pass through filter_xss()
when specified in the list of allowed tags.
- Allowed hook_field_schema() implementations to specify indexes for fields
diff --git a/modules/system/system.module b/modules/system/system.module
index 6a6200ea1..8fc517fc1 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2030,7 +2030,6 @@ function system_user_timezone(&$form, &$form_state) {
'#description' => t('Select the desired local time and time zone. Dates and times throughout this site will be displayed using this time zone.'),
);
if (!isset($account->timezone) && $account->uid == $user->uid && empty($form_state['input']['timezone'])) {
- $form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Confirm the selection and click save.');
$form['timezone']['timezone']['#attributes'] = array('class' => array('timezone-detect'));
drupal_add_js('misc/timezone.js');
}