bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security update core+modules

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sites/all/modules/date/date_admin.inc
View File

@@ -370,11 +370,11 @@ function _date_field_widget_settings_form($field, $instance) {
);
if (in_array($widget['type'], array('date_select'))) {
$options = array('above' => t('Above'), 'within' => t('Within'), 'none' => t('None'));
$description = t("The location of date part labels, like 'Year', 'Month', or 'Day' . 'Above' displays the label as titles above each date part. 'Within' inserts the label as the first option in the select list and in blank textfields. 'None' doesn't label any of the date parts. Theme functions like 'date_part_label_year' and 'date_part_label_month' control label text.");
$description = t("The location of date part labels, like 'Year', 'Month', or 'Day' . 'Above' displays the label as titles above each date part. 'Within' inserts the label as the first option in the select list and in blank textfields. 'None' doesn't visually label any of the date parts. Theme functions like 'date_part_label_year' and 'date_part_label_month' control label text.");
}
else {
$options = array('above' => t('Above'), 'none' => t('None'));
$description = t("The location of date part labels, like 'Year', 'Month', or 'Day' . 'Above' displays the label as titles above each date part. 'None' doesn't label any of the date parts. Theme functions like 'date_part_label_year' and 'date_part_label_month' control label text.");
$description = t("The location of date part labels, like 'Year', 'Month', or 'Day' . 'Above' displays the label as titles above each date part. 'None' doesn't visually label any of the date parts. Theme functions like 'date_part_label_year' and 'date_part_label_month' control label text.");
}
$form['advanced']['label_position'] = array(
'#type' => 'radios',
@@ -453,6 +453,9 @@ function _date_field_settings_form($field, $instance, $has_data) {
$tz_handling = $settings['tz_handling'];
$description = t('Select the date attributes to collect and store.');
if ($has_data) {
$description .= ' ' . t('Changes to date attributes only effects new or updated content.');
}
$options = date_granularity_names();
$checkbox_year = array(
'#type' => 'checkbox',
@@ -469,7 +472,6 @@ function _date_field_settings_form($field, $instance, $has_data) {
'#options' => $options,
'#attributes' => array('class' => array('container-inline')),
'#description' => $description,
'#disabled' => $has_data,
'year' => $checkbox_year,
);
@@ -499,7 +501,6 @@ function _date_field_settings_form($field, $instance, $has_data) {
'#default_value' => $tz_handling,
'#options' => date_timezone_handling_options(),
'#description' => $description,
'#disabled' => $has_data,
'#attached' => array(
'js' => array(drupal_get_path('module', 'date') . '/date_admin.js'),
),