*** daterange.module.orig	Wed Sep 26 15:18:27 2007
--- daterange.module	Wed Sep 26 17:36:05 2007
***************
*** 174,180 ****
    if (!is_array($values)) {
      $values = array('date1' => '', 'date2' => '');
    }
!   if ($form_element['date1']['#name'] != 'edit[date1]') {
      $form_element['date1']['#default_value'] = $values['date1'];
      $form_element['date2']['#default_value'] = $values['date2'];
    }
--- 174,181 ----
    if (!is_array($values)) {
      $values = array('date1' => '', 'date2' => '');
    }
!   //if ($form_element['date1']['#name'] != 'edit[date1]') {
!   if ($form_element['date1']['#name'] != 'filter0[date1]') {
      $form_element['date1']['#default_value'] = $values['date1'];
      $form_element['date2']['#default_value'] = $values['date2'];
    }
***************
*** 186,195 ****
  }
  
  function views_handler_filter_between_date_after_build($form_element) {
!   if ($form_element['date1']['#name'] == 'date1') {
      // get rid of 'edit' in name
!     $form_element['date1']['#name'] = $form_element['#name'] .'[date1]';
!     $form_element['date2']['#name'] = $form_element['#name'] .'[date2]';
  
      // set the select elements to the previously chosen date
      $form_element['date1']['#value'] = $form_element['#default_value']['date1'];
--- 187,196 ----
  }
  
  function views_handler_filter_between_date_after_build($form_element) {
!   if ($form_element['date1']['#name'] == 'filter0[date1]') {
      // get rid of 'edit' in name
!     //$form_element['date1']['#name'] = $form_element['#name'] .'[date1]';
!     //$form_element['date2']['#name'] = $form_element['#name'] .'[date2]';
  
      // set the select elements to the previously chosen date
      $form_element['date1']['#value'] = $form_element['#default_value']['date1'];
***************
*** 284,289 ****
--- 285,291 ----
        $form["filter$index"]['#default_value']['date2'] = 'today';
      }
    }
+   $form["filter$index"]['#tree'] = TRUE;
  }
  
  function views_handler_filter_between_date($op, $filter, &$filterinfo, &$query) {