diff -rN date/date_views//date_views.info date_patched/date_views//date_views.info
12a13
> files[] = includes/date_views_field_handler.inc
diff -rN date/date_views//includes/date_views_argument_handler.inc date_patched/date_views//includes/date_views_argument_handler.inc
1a2
> dpm("@@@");
diff -rN date/date_views//includes/date_views_field_handler.inc date_patched/date_views//includes/date_views_field_handler.inc
0a1,119
> <?php
> /**
>  * @file
>  * Date field advanced handler.
>  */
> class date_views_field_handler extends views_handler_field_date {
> 
>   function option_definition() {
>     $options = parent::option_definition();
> 
>     $options['date_format'] = array('default' => 'small');
>     $options['custom_date_format'] = array('default' => '');
>     $options['query_format'] = array('default' => FALSE);
> 
>     return $options;
>   }
> 
>   function options_form(&$form, &$form_state) {
> 
>     $date_formats = array();
>     $date_types = system_get_date_types();
>     foreach ($date_types as $key => $value) {
>       $date_formats[$value['type']] = check_plain(t($value['title'] . ' format')) . ': ' . format_date(REQUEST_TIME, $value['type']);
>     }
> 
>     $form['date_format'] = array(
>       '#type' => 'select',
>       '#title' => t('Date format'),
>       '#options' => $date_formats + array(
>         'custom' => t('Custom'),
>         'raw time ago' => t('Time ago'),
>         'time ago' => t('Time ago (with "ago" appended)'),
>         'raw time hence' => t('Time hence'),
>         'time hence' => t('Time hence (with "hence" appended)'),
>         'raw time span' => t('Time span (future dates have "-" prepended)'),
>         'inverse time span' => t('Time span (past dates have "-" prepended)'),
>         'time span' => t('Time span (with "ago/hence" appended)'),
>       ),
>       '#default_value' => isset($this->options['date_format']) ? $this->options['date_format'] : 'small',
>     );
>     $form['custom_date_format'] = array(
>       '#type' => 'textfield',
>       '#title' => t('Custom date format'),
>       '#description' => t('If "Custom", see <a href="http://us.php.net/manual/en/function.date.php" target="_blank">the PHP docs</a> for date formats. If "Time ago", enter the number of different time units to display, which defaults to 2.'),
>       '#default_value' => isset($this->options['custom_date_format']) ? $this->options['custom_date_format'] : '',
>       '#dependency' => array('edit-options-date-format' => array('custom', 'raw time ago', 'time ago', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span')),
>     );
> 
>     $form['query_format'] = array(
>       '#type' => 'checkbox',
>       '#title' => t('Use Date Format in query'),
>       '#default_value' => $this->options['query_format'],
>       '#description' => t('Change the SQL query to use the defined date format instead standard unixtime.<br> Only valid for Custom Date Formats and Date API defined formats'),
>     );
> 
>     parent::options_form($form, $form_state);
>   }
> 
>   function query() {
>     $this->ensure_my_table();
> 
>     if ($this->options['query_format']) {
>       $date_format_options = $this->options;
>       $default_views_formats = array('small','medium','large','raw time ago','time ago','raw time span','time span');
>       if (!in_array($date_format_options['date_format'], $default_views_formats)) {
>         $date_format = ($date_format_options['date_format'] == 'custom') ? $date_format_options['custom_date_format'] : $date_format_options['date_format'];
>         $sql_date_format = views_date_sql_format($date_format, $this->table_alias . '.' . $this->real_field);
>         $this->field_alias = $this->query->add_field(NULL, $sql_date_format, $this->table_alias . '_' . $this->real_field);
>       }
>       else {
>         $this->field_alias = $this->query->add_field($this->table_alias, $this->real_field);
>       }
>     }
>     else {
>       $this->field_alias = $this->query->add_field($this->table_alias, $this->real_field);
>     }
> 
>     $this->add_additional_fields();
>   }
> 
>   function render($values) {
>     $value = $this->get_value($values);
>     $format = $this->options['date_format'];
>     if (in_array($format, array('custom', 'raw time ago', 'time ago', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span'))) {
>       $custom_format = $this->options['custom_date_format'];
>     }
> 
>     if ($value) {
>       $time_diff = REQUEST_TIME - $value; // will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence)
>       switch ($format) {
>         case 'small':
>         case 'medium':
>         case 'large':
>           return format_date($value, $format);     
>         case 'raw time ago':
>           return format_interval($time_diff, is_numeric($custom_format) ? $custom_format : 2);
>         case 'time ago':
>           return t('%time ago', array('%time' => format_interval($time_diff, is_numeric($custom_format) ? $custom_format : 2)));
>         case 'raw time hence':
>           return format_interval(-$time_diff, is_numeric($custom_format) ? $custom_format : 2);
>         case 'time hence':
>           return t('%time hence', array('%time' => format_interval(-$time_diff, is_numeric($custom_format) ? $custom_format : 2)));
>         case 'raw time span':
>           return ($time_diff < 0 ? '-' : '') . format_interval(abs($time_diff), is_numeric($custom_format) ? $custom_format : 2);
>         case 'inverse time span':
>           return ($time_diff > 0 ? '-' : '') . format_interval(abs($time_diff), is_numeric($custom_format) ? $custom_format : 2);
>         case 'time span':
>           return t(($time_diff < 0 ? '%time hence' : '%time ago'), array('%time' => format_interval(abs($time_diff), is_numeric($custom_format) ? $custom_format : 2)));
>         case 'custom':
>           if ($custom_format == 'r') {
>             return ($this->options['query_format']) ? $value : format_date($value, $format, $custom_format, null, 'en');
>           }
>           return ($this->options['query_format']) ? $value : format_date($value, 'custom', $custom_format);
>         default:
>           return ($this->options['query_format']) ? $value : format_date($value, 'custom', $format);
>       }
>     }
>   }
> }
diff -rN date/date_views//includes/date_views.views.inc date_patched/date_views//includes/date_views.views.inc
120a121,134
>  * Implementation of hook_views_data_alter().
>  * Updates date field handlers.
>  */
> function date_views_views_data_alter(&$data) {
>   foreach ($data as $table => $fields) {
>     foreach ($fields as $field => $field_data) {
>       if (isset($field_data['field']['handler']) && $field_data['field']['handler'] == 'views_handler_field_date') {
>         $data[$table][$field]['field']['handler'] = 'date_views_field_handler';
>       }
>     }
>   }
> }
> 
> /**