/[drupal]/contributions/modules/date/date/date_elements.inc
ViewVC logotype

Diff of /contributions/modules/date/date/date_elements.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.22.2.15, Fri Jun 6 13:30:21 2008 UTC revision 1.22.2.16, Tue Jun 17 10:40:52 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  //$Id: date_elements.inc,v 1.22.2.14 2008/05/10 00:46:49 karens Exp $  //$Id: date_elements.inc,v 1.22.2.15 2008/06/06 13:30:21 karens Exp $
3  /**  /**
4   * @file   * @file
5   * Date forms and form themes and validation.   * Date forms and form themes and validation.
# Line 291  function date_combo_process($element, $e Line 291  function date_combo_process($element, $e
291      '#date_label_position' => $field['widget']['label_position'],      '#date_label_position' => $field['widget']['label_position'],
292      );      );
293    
294    $element[$from_field]['#description'] .= ' '. t('Format: @date', array('@date' => date($element[$from_field]['#date_format'], time())));    if ($field['widget']['type'] != 'date_select') {
295        $element[$from_field]['#description'] .= ' '. t('Format: @date', array('@date' => date($element[$from_field]['#date_format'], time())));
296      }
297    
298    // Give this element the right type, using a Date API    // Give this element the right type, using a Date API
299    // or a Date Popup element type.    // or a Date Popup element type.

Legend:
Removed from v.1.22.2.15  
changed lines
  Added in v.1.22.2.16

  ViewVC Help
Powered by ViewVC 1.1.2