diff -urBbp date-DRUPAL-6--2/includes/date_api_argument_handler.inc drupal/sites/all/modules/date/includes/date_api_argument_handler.inc --- date-DRUPAL-6--2/includes/date_api_argument_handler.inc 2009-09-16 03:47:23.000000000 -0700 +++ drupal/sites/all/modules/date/includes/date_api_argument_handler.inc 2010-01-16 16:53:59.000000000 -0800 @@ -143,7 +143,26 @@ class date_api_argument_handler extends */ function get_default_argument($raw = FALSE) { if (!$raw && $this->options['default_argument_type'] == 'date') { - return date($this->format(), time()); + $arg = date($this->format(), time()); + + //watchdog("Date","
".print_r(array($arg,$this->format()),true)."
"); + + $parts = $this->date_handler->arg_parts($arg); + + if($parts[0]['date']['week']){ + $last_week_of_year = date("W",strtotime(($year-1)."-"."12-31")); + $last_day_of_year = date("w",strtotime(($year-1)."-"."12-31")); + if ($last_day_of_year > 3) { + if ($week == $last_week_of_year) { + $week=1; + } + else { + $arg = date($this->format(), time()+7*24*60*60); + //$week++; + } + } + } + return $arg; } else { return parent::get_default_argument($raw);