diff options
| -rw-r--r-- | includes/form.inc | 2 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/includes/form.inc b/includes/form.inc index 4747ba971..1a7863e55 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -1036,7 +1036,7 @@ function expand_date($element) { $element['#tree'] = TRUE; // Determine the order of day, month, year in the site's chosen date format. - $format = variable_get('date_format_short', 'm/d/Y'); + $format = variable_get('date_format_short', 'm/d/Y - H:i'); $sort = array(); $sort['day'] = max(strpos($format, 'd'), strpos($format, 'j')); $sort['month'] = max(strpos($format, 'm'), strpos($format, 'M')); diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index a5ec9b18c..d5cf06263 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -1368,7 +1368,7 @@ function theme_aggregator_page_item($item) { $source_date = t('%ago ago', array('%ago' => format_interval(time() - $item->timestamp))); } else { - $source_date = format_date($item->timestamp, 'custom', variable_get('date_format_medium', 'D, Y-m-d H:i')); + $source_date = format_date($item->timestamp, 'custom', variable_get('date_format_medium', 'D, m/d/Y - H:i')); } $output .= "<div class=\"feed-item\">\n"; diff --git a/modules/system/system.module b/modules/system/system.module index b89c5adc2..ac6ae856b 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -722,7 +722,7 @@ function system_date_time_settings() { $zones = _system_zonelist(); // Date settings: possible date formats - $dateshort = array('Y-m-d H:i','m/d/Y - H:i', 'd/m/Y - H:i', 'Y/m/d - H:i', + $dateshort = array('Y-m-d H:i', 'm/d/Y - H:i', 'd/m/Y - H:i', 'Y/m/d - H:i', 'd.m.Y - H:i', 'm/d/Y - g:ia', 'd/m/Y - g:ia', 'Y/m/d - g:ia', 'M j Y - H:i', 'j M Y - H:i', 'Y M j - H:i', 'M j Y - g:ia', 'j M Y - g:ia', 'Y M j - g:ia'); @@ -763,7 +763,7 @@ function system_date_time_settings() { $form['date_format_short'] = array( '#type' => 'select', '#title' => t('Short date format'), - '#default_value' => variable_get('date_format_short', $dateshort[0]), + '#default_value' => variable_get('date_format_short', $dateshort[1]), '#options' => $dateshortchoices, '#description' => t('The short format of date display.') ); @@ -771,7 +771,7 @@ function system_date_time_settings() { $form['date_format_medium'] = array( '#type' => 'select', '#title' => t('Medium date format'), - '#default_value' => variable_get('date_format_medium', $datemedium[0]), + '#default_value' => variable_get('date_format_medium', $datemedium[1]), '#options' => $datemediumchoices, '#description' => t('The medium sized date display.') ); |